[jbpm-commits] JBoss JBPM SVN: r3740 - in jbpm4/trunk: eclipse and 329 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-02-02 09:27:18 -0500 (Mon, 02 Feb 2009) New Revision: 3740 Added: jbpm4/trunk/modules/db/jbpm4-db.iml jbpm4/trunk/modules/distro/scripts/ jbpm4/trunk/modules/distro/scripts/antrun-installer.xml jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml jbpm4/trunk/modules/distro/src/main/resources/installer/ jbpm4/trunk/modules/distro/src/main/resources/installer/ant-actions-spec.xml jbpm4/trunk/modules/distro/src/main/resources/installer/auto-install-template.xml jbpm4/trunk/modules/distro/src/main/resources/installer/download-helper.xml jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/trunk/modules/distro/src/main/resources/installer/target-panel-dir.txt jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml jbpm4/trunk/modules/distro/src/main/resources/release.notes.html jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml jbpm4/trunk/modules/examples/jbpm4-examples.iml jbpm4/trunk/modules/jpdl/scripts/antrun-jbpm-config.xml jbpm4/trunk/modules/jpdl/scripts/assembly-config.xml jbpm4/trunk/modules/jpdl/scripts/build.schema.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.cfg.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.common.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.db2.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.derby.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties jbpm4/trunk/modules/test-db/jpm4-test-db.iml Removed: jbpm4/trunk/modules/config/src/main/resources/hibernate.properties jbpm4/trunk/modules/distro/scripts/antrun-installer.xml jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml jbpm4/trunk/modules/distro/src/main/resources/installer/ant-actions-spec.xml jbpm4/trunk/modules/distro/src/main/resources/installer/auto-install-template.xml jbpm4/trunk/modules/distro/src/main/resources/installer/download-helper.xml jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/trunk/modules/distro/src/main/resources/installer/target-panel-dir.txt jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml jbpm4/trunk/modules/enterprise/src/test/resources/hibernate.properties jbpm4/trunk/modules/examples/src/test/resources/hibernate.properties jbpm4/trunk/modules/jpdl/src/test/resources/hibernate.properties jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties jbpm4/trunk/modules/task/src/test/resources/hibernate.properties jbpm4/trunk/modules/test-db/src/main/resources/hibernate.properties jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties Modified: jbpm4/trunk/ jbpm4/trunk/eclipse/ jbpm4/trunk/hudson/ jbpm4/trunk/hudson/jbpm4-base.sh jbpm4/trunk/hudson/jbpm4-db.sh jbpm4/trunk/hudson/jbpm4-load.sh jbpm4/trunk/modules/ jbpm4/trunk/modules/api/ jbpm4/trunk/modules/api/src/ jbpm4/trunk/modules/api/src/main/ jbpm4/trunk/modules/api/src/main/java/ jbpm4/trunk/modules/api/src/main/java/org/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/job/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/session/ jbpm4/trunk/modules/api/src/main/java/org/jbpm/task/ jbpm4/trunk/modules/api/src/main/resources/ jbpm4/trunk/modules/config/ jbpm4/trunk/modules/config/src/ jbpm4/trunk/modules/config/src/main/ jbpm4/trunk/modules/config/src/main/resources/ jbpm4/trunk/modules/db/ jbpm4/trunk/modules/db/pom.xml jbpm4/trunk/modules/db/src/ jbpm4/trunk/modules/db/src/main/ jbpm4/trunk/modules/db/src/main/ant/ jbpm4/trunk/modules/db/src/main/resources/ jbpm4/trunk/modules/db/src/main/resources/db.properties/ jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties jbpm4/trunk/modules/devguide/ jbpm4/trunk/modules/devguide/src/ jbpm4/trunk/modules/devguide/src/main/ jbpm4/trunk/modules/devguide/src/main/diagrams/ jbpm4/trunk/modules/devguide/src/main/docbook/ jbpm4/trunk/modules/devguide/src/main/docbook/en/ jbpm4/trunk/modules/devguide/src/main/docbook/en/images/ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ jbpm4/trunk/modules/distro/ jbpm4/trunk/modules/distro/pom.xml jbpm4/trunk/modules/distro/src/ jbpm4/trunk/modules/distro/src/main/ jbpm4/trunk/modules/distro/src/main/resources/ jbpm4/trunk/modules/enterprise/ jbpm4/trunk/modules/enterprise/pom.xml jbpm4/trunk/modules/enterprise/scripts/ jbpm4/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml jbpm4/trunk/modules/enterprise/src/ jbpm4/trunk/modules/enterprise/src/main/ jbpm4/trunk/modules/enterprise/src/main/java/ jbpm4/trunk/modules/enterprise/src/main/java/org/ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/ jbpm4/trunk/modules/enterprise/src/main/resources/ jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/ jbpm4/trunk/modules/enterprise/src/test/ jbpm4/trunk/modules/enterprise/src/test/java/ jbpm4/trunk/modules/enterprise/src/test/java/org/ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/ jbpm4/trunk/modules/enterprise/src/test/resources/ jbpm4/trunk/modules/enterprise/src/test/resources/META-INF/ jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF/ jbpm4/trunk/modules/examples/ jbpm4/trunk/modules/examples/pom.xml jbpm4/trunk/modules/examples/src/ jbpm4/trunk/modules/examples/src/eclipse/ jbpm4/trunk/modules/examples/src/test/ jbpm4/trunk/modules/examples/src/test/java/ jbpm4/trunk/modules/examples/src/test/java/org/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/states/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/ jbpm4/trunk/modules/examples/src/test/resources/ jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/examples/src/test/resources/org/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/processinstance/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/esb/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/sequence/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/states/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/ jbpm4/trunk/modules/jpdl/ jbpm4/trunk/modules/jpdl/pom.xml jbpm4/trunk/modules/jpdl/scripts/ jbpm4/trunk/modules/jpdl/src/ jbpm4/trunk/modules/jpdl/src/main/ jbpm4/trunk/modules/jpdl/src/main/java/ jbpm4/trunk/modules/jpdl/src/main/java/org/ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/el/ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/deploy/ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/impl/ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/ jbpm4/trunk/modules/jpdl/src/main/resources/ jbpm4/trunk/modules/jpdl/src/test/ jbpm4/trunk/modules/jpdl/src/test/java/ jbpm4/trunk/modules/jpdl/src/test/java/org/ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/ jbpm4/trunk/modules/jpdl/src/test/resources/ jbpm4/trunk/modules/jpdl/src/test/resources/org/ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/ jbpm4/trunk/modules/log/ jbpm4/trunk/modules/log/src/ jbpm4/trunk/modules/log/src/main/ jbpm4/trunk/modules/log/src/main/java/ jbpm4/trunk/modules/log/src/main/java/org/ jbpm4/trunk/modules/log/src/main/java/org/jbpm/ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/ jbpm4/trunk/modules/pvm/ jbpm4/trunk/modules/pvm/pom.xml jbpm4/trunk/modules/pvm/src/ jbpm4/trunk/modules/pvm/src/main/ jbpm4/trunk/modules/pvm/src/main/java/ jbpm4/trunk/modules/pvm/src/main/java/org/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ jbpm4/trunk/modules/pvm/src/main/resources/ jbpm4/trunk/modules/pvm/src/test/ jbpm4/trunk/modules/pvm/src/test/java/ jbpm4/trunk/modules/pvm/src/test/java/org/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/cron/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/util/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/println/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/variables/ jbpm4/trunk/modules/pvm/src/test/resources/ jbpm4/trunk/modules/pvm/src/test/resources/org/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/enterprise/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/enterprise/custom/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/embedded/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/wire/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/xml/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/variables/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/wire/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/xml/ jbpm4/trunk/modules/task/ jbpm4/trunk/modules/task/pom.xml jbpm4/trunk/modules/task/src/ jbpm4/trunk/modules/task/src/main/ jbpm4/trunk/modules/task/src/main/docs/ jbpm4/trunk/modules/task/src/main/java/ jbpm4/trunk/modules/task/src/main/java/org/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor/ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session/ jbpm4/trunk/modules/task/src/main/resources/ jbpm4/trunk/modules/task/src/test/ jbpm4/trunk/modules/task/src/test/java/ jbpm4/trunk/modules/task/src/test/java/org/ jbpm4/trunk/modules/task/src/test/java/org/jbpm/ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/ jbpm4/trunk/modules/task/src/test/resources/ jbpm4/trunk/modules/test-base/ jbpm4/trunk/modules/test-base/src/ jbpm4/trunk/modules/test-base/src/main/ jbpm4/trunk/modules/test-base/src/main/java/ jbpm4/trunk/modules/test-base/src/main/java/org/ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/ jbpm4/trunk/modules/test-db/ jbpm4/trunk/modules/test-db/pom.xml jbpm4/trunk/modules/test-db/src/ jbpm4/trunk/modules/test-db/src/main/ jbpm4/trunk/modules/test-db/src/main/java/ jbpm4/trunk/modules/test-db/src/main/java/org/ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/ jbpm4/trunk/modules/test-db/src/main/resources/ jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml jbpm4/trunk/modules/test-load/ jbpm4/trunk/modules/test-load/src/ jbpm4/trunk/modules/test-load/src/main/ jbpm4/trunk/modules/test-load/src/main/parked/ jbpm4/trunk/modules/test-load/src/main/scripts/ jbpm4/trunk/modules/test-load/src/test/ jbpm4/trunk/modules/test-load/src/test/java/ jbpm4/trunk/modules/test-load/src/test/java/org/ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/ jbpm4/trunk/modules/test-load/src/test/resources/ jbpm4/trunk/modules/test-load/src/test/resources/org/ jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/ jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/ jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/load/ jbpm4/trunk/modules/test-pojo/ jbpm4/trunk/modules/test-pojo/src/ jbpm4/trunk/modules/test-pojo/src/main/ jbpm4/trunk/modules/test-pojo/src/main/java/ jbpm4/trunk/modules/test-pojo/src/main/java/org/ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ jbpm4/trunk/modules/test-pojo/src/main/resources/ jbpm4/trunk/modules/userguide/ jbpm4/trunk/modules/userguide/src/ jbpm4/trunk/modules/userguide/src/main/ jbpm4/trunk/modules/userguide/src/main/diagrams/ jbpm4/trunk/modules/userguide/src/main/diagrams/bpmn/ jbpm4/trunk/modules/userguide/src/main/docbook/ jbpm4/trunk/modules/userguide/src/main/docbook/en/ jbpm4/trunk/modules/userguide/src/main/docbook/en/images/ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ jbpm4/trunk/pom.xml jbpm4/trunk/profiles.xml.example Log: svn merge -r3711:HEAD https://svn.jboss.org/repos/jbpm/jbpm4/branches/hbraun Property changes on: jbpm4/trunk ___________________________________________________________________ Name: svn:ignore - .settings profiles.xml target + *.iml Property changes on: jbpm4/trunk/eclipse ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/hudson ___________________________________________________________________ Name: svn:ignore - target ant.properties + *.iml Modified: jbpm4/trunk/hudson/jbpm4-base.sh =================================================================== --- jbpm4/trunk/hudson/jbpm4-base.sh 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/hudson/jbpm4-base.sh 2009-02-02 14:27:18 UTC (rev 3740) @@ -10,6 +10,11 @@ DISTRODIR=$JBPMDIR/modules/distribution/target # +# default environment settings +# +cp $JBPMDIR/profiles.xml.example $JBPMDIR/profiles.xml + +# # build the tests # cd $JBPMDIR Modified: jbpm4/trunk/hudson/jbpm4-db.sh =================================================================== --- jbpm4/trunk/hudson/jbpm4-db.sh 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/hudson/jbpm4-db.sh 2009-02-02 14:27:18 UTC (rev 3740) @@ -11,10 +11,9 @@ JBPMDIR=$WORKSPACE/jbpm4 # -# copy the profiles.xml +# default environment settings # -echo copying profiles.xml from resources -cp -f $WORKSPACE/resources/profiles-db.xml $JBPMDIR/profiles.xml +cp $JBPMDIR/profiles.xml.example $JBPMDIR/profiles.xml # # build the tests Modified: jbpm4/trunk/hudson/jbpm4-load.sh =================================================================== --- jbpm4/trunk/hudson/jbpm4-load.sh 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/hudson/jbpm4-load.sh 2009-02-02 14:27:18 UTC (rev 3740) @@ -10,11 +10,11 @@ DISTRODIR=$JBPMDIR/modules/distribution/target # -# copy the profiles.xml +# default environment settings # -echo copying profiles.xml from resources -cp -f $WORKSPACE/resources/profiles-load.xml $JBPMDIR/profiles.xml +cp $JBPMDIR/profiles.xml.example $JBPMDIR/profiles.xml + # # build the tests # Property changes on: jbpm4/trunk/modules ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api ___________________________________________________________________ Name: svn:ignore - .settings target + *.iml Property changes on: jbpm4/trunk/modules/api/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/client ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/cmd ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/job ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/listener ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/processlog ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/session ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/api/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/config ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/config/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/config/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/config/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/config/src/main/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/config/src/main/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/config/src/main/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,12 +0,0 @@ -hibernate.dialect=org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class=org.hsqldb.jdbcDriver -hibernate.connection.url=jdbc:hsqldb:mem:. -hibernate.connection.username=sa -hibernate.connection.password= -hibernate.hbm2ddl.auto=create-drop -hibernate.cache.use_second_level_cache=true -hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider - -# hibernate.show_sql=true -# hibernate.format_sql=true -# hibernate.use_sql_comments=true Property changes on: jbpm4/trunk/modules/db ___________________________________________________________________ Name: svn:ignore - .settings target + *.iml Copied: jbpm4/trunk/modules/db/jbpm4-db.iml (from rev 3739, jbpm4/branches/hbraun/modules/db/jbpm4-db.iml) =================================================================== --- jbpm4/trunk/modules/db/jbpm4-db.iml (rev 0) +++ jbpm4/trunk/modules/db/jbpm4-db.iml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,253 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jbpm4-toplevel" /> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:jbossesb-rosetta:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/jbossesb-rosetta/4.4.0.GA/jbossesb-rosetta-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: stax:stax-api:jar:1.0.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: stax:stax:jar:1.2.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jboss.jbossts:jbossts-common:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.springframework:spring:jar:2.5.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Modified: jbpm4/trunk/modules/db/pom.xml =================================================================== --- jbpm4/trunk/modules/db/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/db/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -24,7 +24,7 @@ <version>4.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - + <!-- Dependencies --> <dependencies> <dependency> @@ -51,6 +51,12 @@ <!-- Plugins --> <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> Property changes on: jbpm4/trunk/modules/db/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/db/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/db/src/main/ant ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/db/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/db/src/main/resources/db.properties ___________________________________________________________________ Name: svn:ignore + *.iml Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties =================================================================== --- jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,8 +1,11 @@ +## +## jbpm-db hsqldb config +## hibernate.dialect=org.hibernate.dialect.HSQLDialect hibernate.connection.driver_class=org.hsqldb.jdbcDriver -hibernate.connection.url=jdbc:hsqldb:hsql://${jdbc.server}/${jdbc.dbname} -hibernate.connection.username=${jdbc.username} -hibernate.connection.password=${jdbc.password} +hibernate.connection.url=${jdbc.hsql.url} +hibernate.connection.username=${jdbc.hsql.username} +hibernate.connection.password=${jdbc.hsql.password} hibernate.cache.use_second_level_cache=true hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties =================================================================== --- jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,8 +1,11 @@ +## +## jbpm-db mysql config +## hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect hibernate.connection.driver_class=com.mysql.jdbc.Driver -hibernate.connection.url=jdbc:mysql://${jdbc.server}/${jdbc.dbname} -hibernate.connection.username=${jdbc.username} -hibernate.connection.password=${jdbc.password} +hibernate.connection.url=${jdbc.mysql.url} +hibernate.connection.username=${jdbc.mysql.username} +hibernate.connection.password=${jdbc.mysql.password} hibernate.cache.use_second_level_cache=true Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties =================================================================== --- jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,9 +1,9 @@ hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect # fetch driver from http://jdbc.postgresql.org/ hibernate.connection.driver_class=org.postgresql.Driver -hibernate.connection.url=jdbc:postgresql://${jdbc.server}/${jdbc.dbname} -hibernate.connection.username=${jdbc.username} -hibernate.connection.password=${jdbc.password} +hibernate.connection.url=${jdbc.postgresql.url} +hibernate.connection.username=${jdbc.postgresql.username} +hibernate.connection.password=${jdbc.postgresql.password} hibernate.cache.use_second_level_cache=true hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties =================================================================== --- jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,8 +1,8 @@ hibernate.dialect=org.hibernate.dialect.SybaseDialect hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver -hibernate.connection.url=jdbc:jtds:sybase://${jdbc.server}/${jdbc.dbname} -hibernate.connection.username=${jdbc.username} -hibernate.connection.password=${jdbc.password} +hibernate.connection.url=${jdbc.ybase.url} +hibernate.connection.username=${jdbc.sybase.username} +hibernate.connection.password=${jdbc.sybase.password} hibernate.cache.use_second_level_cache=true hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Property changes on: jbpm4/trunk/modules/devguide ___________________________________________________________________ Name: svn:ignore - target + *.iml Property changes on: jbpm4/trunk/modules/devguide/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/devguide/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/devguide/src/main/diagrams ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook/en ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook/en/images ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/distro ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Modified: jbpm4/trunk/modules/distro/pom.xml =================================================================== --- jbpm4/trunk/modules/distro/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -11,7 +11,7 @@ <!-- $Id$ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - + <modelVersion>4.0.0</modelVersion> <name>jBPM 4 - Distro</name> <groupId>org.jbpm.jbpm4</groupId> @@ -25,21 +25,12 @@ <relativePath>../../pom.xml</relativePath> </parent> - <!-- Properties --> - <properties> - </properties> - - <!-- DependencyManagement --> - <dependencyManagement> - </dependencyManagement> - <!-- Dependencies --> <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-gpd</artifactId> <type>zip</type> - <version>4.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> @@ -63,7 +54,8 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-db</artifactId> + <artifactId>jbpm-jpdl</artifactId> + <classifier>config</classifier> <version>${version}</version> </dependency> <dependency> @@ -76,8 +68,19 @@ <artifactId>jbpm-test-db</artifactId> <version>${version}</version> </dependency> - <!-- + + <!-- Please sort by groupid --> <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> + <dependency> + <groupId>izpack</groupId> + <artifactId>standalone-compiler</artifactId> + </dependency> + + <!-- + <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-workspace</artifactId> <version>1.0</version> @@ -85,7 +88,7 @@ </dependency> --> </dependencies> - + <!-- Plugins --> <build> <plugins> @@ -93,7 +96,7 @@ <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-2</version> <executions> - <execution> + <!--execution> <id>generate-jbpm-impl-jar</id> <phase>package</phase> <goals> @@ -122,9 +125,58 @@ <descriptor>assembly-distro-package.xml</descriptor> </descriptors> </configuration> + </execution--> + + <!-- Installer --> + + <execution> + <id>create-installer</id> + <phase>process-resources</phase> + <goals> + <goal>directory-single</goal> + </goals> + <configuration> + <finalName>deploy-artifacts</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-deploy-artifacts.xml</descriptor> + </descriptors> + </configuration> </execution> + </executions> </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>izpack</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> + <property name="database" value="${database}" /> + <property name="jboss.home" value="${jboss.home}" /> + <property name="jboss422.home" value="${jboss422.home}" /> + <property name="jboss423.home" value="${jboss423.home}" /> + <property name="jboss500.home" value="${jboss500.home}" /> + <property name="jbpm.target.container" value="${jbpm.target.container}" /> + <property name="product.name" value="${project.name}" /> + <property name="product.short.name" value="${artifactId}" /> + <property name="product.version" value="${project.version}" /> + <property name="user.home" value="${user.home}" /> + <ant antfile="scripts/antrun-installer.xml" target="build-installer" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> Copied: jbpm4/trunk/modules/distro/scripts (from rev 3739, jbpm4/branches/hbraun/modules/distro/scripts) Property changes on: jbpm4/trunk/modules/distro/scripts ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/distro/scripts/antrun-installer.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/scripts/antrun-installer.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,143 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id: antrun-installer.xml 3319 2008-12-10 14:29:01Z thomas.diesler(a)jboss.com $ --> -<project> - - <macrodef name="macro-disable"> - <attribute name="file" /> - <attribute name="section" /> - <sequential> - <replace file="@{file}" summary="true"> - <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacetoken> - <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacevalue> - </replace> - <replace file="@{file}" summary="true"> - <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> - <replacevalue><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> - </replace> - </sequential> - </macrodef> - - <macrodef name="macro-enable"> - <attribute name="file" /> - <attribute name="section" /> - <sequential> - <replace file="@{file}" summary="true"> - <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacetoken> - <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacevalue> - </replace> - <replace file="@{file}" summary="true"> - <replacetoken><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> - <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> - </replace> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - <property name="output.dir" value="${basedir}/target" /> - <property name="resources.dir" value="${basedir}/src/main/resources" /> - <property name="filtered.resources.dir" value="${output.dir}/resources" /> - <property name="deploy.artifacts.dir" value="${output.dir}/deploy-artifacts" /> - <property name="deploy.artifacts.lib" value="${deploy.artifacts.dir}/lib" /> - <property name="deploy.artifacts.resources" value="${deploy.artifacts.dir}/resources" /> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - <target name="init"> - - </target> - - <!-- ================================================================== --> - <!-- Configuration --> - <!-- ================================================================== --> - <target name="configure" depends="init"> - - <property name="hsqldb.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml"/> - <macro-disable file="${hsqldb.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${hsqldb.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${hsqldb.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${hsqldb.cfg.xml}" section="JTA transaction properties"/> - - <property name="mysql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.mysql.xml"/> - <macro-disable file="${mysql.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${mysql.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${mysql.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${mysql.cfg.xml}" section="JTA transaction properties"/> - - <property name="postgresql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.postgresql.xml"/> - <macro-disable file="${postgresql.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${postgresql.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties"/> - - <property name="sybase.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.sybase.xml"/> - <macro-disable file="${sybase.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${sybase.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${sybase.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties"/> - - <condition property="database.is.hsqldb" value="true" else="false"> - <equals arg1="${database}" arg2="hsqldb"/> - </condition> - <condition property="database.is.mysql" value="true" else="false"> - <equals arg1="${database}" arg2="mysql"/> - </condition> - <condition property="database.is.postgresql" value="true" else="false"> - <equals arg1="${database}" arg2="postgresql"/> - </condition> - <condition property="database.is.sybase" value="true" else="false"> - <equals arg1="${database}" arg2="sybase"/> - </condition> - - </target> - - <!-- ================================================================== --> - <!-- Distribution --> - <!-- ================================================================== --> - <target name="build-installer" depends="configure"> - - <copy todir="${filtered.resources.dir}" filtering="true" overwrite="true"> - <fileset dir="${resources.dir}/installer" /> - <filterset> - <filter token="database" value="${database}" /> - <filter token="database.is.hsqldb" value="${database.is.hsqldb}" /> - <filter token="database.is.mysql" value="${database.is.mysql}" /> - <filter token="database.is.postgresql" value="${database.is.postgresql}" /> - <filter token="database.is.sybase" value="${database.is.sybase}" /> - <filter token="jbpm.target.container" value="${jbpm.target.container}" /> - <filter token="jboss.home" value="${jboss.home}" /> - <filter token="product.version" value="${product.version}" /> - <filter token="user.home" value="${user.home}" /> - </filterset> - </copy> - - <!-- Allows us to use the IzPack Ant task, standalone-compiler.jar added to Ant lib --> - <taskdef name="izpack" classname="com.izforge.izpack.ant.IzPackTask"> - <classpath> - <pathelement path="${maven.runtime.classpath}" /> - </classpath> - </taskdef> - <property name="izpack.temp.dir" value="${output.dir}/izpack-temp" /> - <mkdir dir="${izpack.temp.dir}" /> - - <!-- Run installer build --> - <echo message="Running IzPack to build the installer..." /> - <izpack input="${resources.dir}/installer/install-definition.xml" output="${output.dir}/jbpm-installer-${product.version}.jar" - installerType="standard" inheritAll="true" basedir="${izpack.temp.dir}" /> - - <!-- Clean working directory --> - <delete dir="${izpack.temp.dir}" quiet="true" includeemptydirs="true" /> - </target> -</project> \ No newline at end of file Copied: jbpm4/trunk/modules/distro/scripts/antrun-installer.xml (from rev 3739, jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml) =================================================================== --- jbpm4/trunk/modules/distro/scripts/antrun-installer.xml (rev 0) +++ jbpm4/trunk/modules/distro/scripts/antrun-installer.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id: antrun-installer.xml 3319 2008-12-10 14:29:01Z thomas.diesler(a)jboss.com $ --> +<project> + + <macrodef name="macro-disable"> + <attribute name="file" /> + <attribute name="section" /> + <sequential> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacetoken> + <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacevalue> + </replace> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> + <replacevalue><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> + </replace> + </sequential> + </macrodef> + + <macrodef name="macro-enable"> + <attribute name="file" /> + <attribute name="section" /> + <sequential> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacetoken> + <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacevalue> + </replace> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> + <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> + </replace> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> + <property name="output.dir" value="${basedir}/target" /> + <property name="resources.dir" value="${basedir}/src/main/resources" /> + <property name="filtered.resources.dir" value="${output.dir}/resources" /> + <property name="deploy.artifacts.dir" value="${output.dir}/deploy-artifacts" /> + <property name="deploy.artifacts.lib" value="${deploy.artifacts.dir}/lib" /> + <property name="deploy.artifacts.resources" value="${deploy.artifacts.dir}/resources" /> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + <target name="init"> + + </target> + + <!-- ================================================================== --> + <!-- Configuration --> + <!-- ================================================================== --> + <target name="configure" depends="init"> + + <property name="hsqldb.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml"/> + <macro-disable file="${hsqldb.cfg.xml}" section="JDBC connection properties"/> + <macro-disable file="${hsqldb.cfg.xml}" section="Automatic schema creation"/> + <macro-enable file="${hsqldb.cfg.xml}" section="DataSource properties"/> + <macro-enable file="${hsqldb.cfg.xml}" section="JTA transaction properties"/> + + <property name="mysql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.mysql.xml"/> + <macro-disable file="${mysql.cfg.xml}" section="JDBC connection properties"/> + <macro-disable file="${mysql.cfg.xml}" section="Automatic schema creation"/> + <macro-enable file="${mysql.cfg.xml}" section="DataSource properties"/> + <macro-enable file="${mysql.cfg.xml}" section="JTA transaction properties"/> + + <property name="postgresql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.postgresql.xml"/> + <macro-disable file="${postgresql.cfg.xml}" section="JDBC connection properties"/> + <macro-disable file="${postgresql.cfg.xml}" section="Automatic schema creation"/> + <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/> + <macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties"/> + + <property name="sybase.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.sybase.xml"/> + <macro-disable file="${sybase.cfg.xml}" section="JDBC connection properties"/> + <macro-disable file="${sybase.cfg.xml}" section="Automatic schema creation"/> + <macro-enable file="${sybase.cfg.xml}" section="DataSource properties"/> + <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties"/> + + <condition property="database.is.hsqldb" value="true" else="false"> + <equals arg1="${database}" arg2="hsqldb"/> + </condition> + <condition property="database.is.mysql" value="true" else="false"> + <equals arg1="${database}" arg2="mysql"/> + </condition> + <condition property="database.is.postgresql" value="true" else="false"> + <equals arg1="${database}" arg2="postgresql"/> + </condition> + <condition property="database.is.sybase" value="true" else="false"> + <equals arg1="${database}" arg2="sybase"/> + </condition> + + </target> + + <!-- ================================================================== --> + <!-- Distribution --> + <!-- ================================================================== --> + <target name="build-installer" depends="configure"> + + <copy todir="${filtered.resources.dir}" filtering="true" overwrite="true"> + <fileset dir="${resources.dir}/installer" /> + <filterset> + <filter token="database" value="${database}" /> + <filter token="database.is.hsqldb" value="${database.is.hsqldb}" /> + <filter token="database.is.mysql" value="${database.is.mysql}" /> + <filter token="database.is.postgresql" value="${database.is.postgresql}" /> + <filter token="database.is.sybase" value="${database.is.sybase}" /> + <filter token="jbpm.target.container" value="${jbpm.target.container}" /> + <filter token="jboss.home" value="${jboss.home}" /> + <filter token="product.version" value="${product.version}" /> + <filter token="user.home" value="${user.home}" /> + </filterset> + </copy> + + <!-- Allows us to use the IzPack Ant task, standalone-compiler.jar added to Ant lib --> + <taskdef name="izpack" classname="com.izforge.izpack.ant.IzPackTask"> + <classpath> + <pathelement path="${maven.runtime.classpath}" /> + </classpath> + </taskdef> + <property name="izpack.temp.dir" value="${output.dir}/izpack-temp" /> + <mkdir dir="${izpack.temp.dir}" /> + + <!-- Run installer build --> + <echo message="Running IzPack to build the installer..." /> + <izpack input="${resources.dir}/installer/install-definition.xml" output="${output.dir}/jbpm-installer-${product.version}.jar" + installerType="standard" inheritAll="true" basedir="${izpack.temp.dir}" /> + + <!-- Clean working directory --> + <delete dir="${izpack.temp.dir}" quiet="true" includeemptydirs="true" /> + </target> +</project> \ No newline at end of file Deleted: jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,165 +0,0 @@ -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - - <id>deploy-artifacts</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <!-- Dependency Sets --> - <dependencySets> - - <!-- lib --> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>compile</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>test</scope> - <unpack>false</unpack> - </dependencySet> - <!--dependencySet> - <includes> - <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> - </includes> - <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> - <outputDirectory>gpd</outputDirectory> - </dependencySet--> - - - <!-- resources --> - <dependencySet> - <outputDirectory>resources/jbpm-jpdl-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-jpdl:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <!--dependencySet> - <outputDirectory>resources/jbpm-enterprise-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-enterprise:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet--> - - </dependencySets> - - <fileSets> - <fileSet> - <directory>src/main/resources</directory> - <includes> - <include>jboss.eula.txt</include> - <include>license.txt</include> - <include>readme.html</include> - <include>release.notes.html</include> - </includes> - <outputDirectory></outputDirectory> - </fileSet> - <fileSet> - <directory>../api/target/site/apidocs</directory> - <outputDirectory>doc/javadocs</outputDirectory> - </fileSet> - <fileSet> - <directory>../api/target/schemadoc</directory> - <outputDirectory>doc/schemadoc</outputDirectory> - </fileSet> - <fileSet> - <directory>../db/target/create</directory> - <outputDirectory>db/create</outputDirectory> - </fileSet> - <fileSet> - <directory>../db/target/drop</directory> - <outputDirectory>db/drop</outputDirectory> - </fileSet> - <fileSet> - <directory>../devguide/target/docbook/publish/en</directory> - <outputDirectory>doc/devguide</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../userguide/target/docbook/publish/en</directory> - <outputDirectory>doc/userguide</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../api/target/schemadocs</directory> - <outputDirectory>doc/schemadocs</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../api/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../api/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../log/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../pvm/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../pvm/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../jpdl/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../jpdl/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../task/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../task/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../test-base/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/test/java</directory> - <outputDirectory>examples/src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/test/resources</directory> - <outputDirectory>examples/src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/eclipse</directory> - <outputDirectory>examples</outputDirectory> - </fileSet> - </fileSets> -</assembly> Copied: jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml (from rev 3739, jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml) =================================================================== --- jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml (rev 0) +++ jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,165 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>deploy-artifacts</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <!-- Dependency Sets --> + <dependencySets> + + <!-- lib --> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>compile</scope> + <unpack>false</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>test</scope> + <unpack>false</unpack> + </dependencySet> + <!--dependencySet> + <includes> + <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> + </includes> + <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> + <outputDirectory>gpd</outputDirectory> + </dependencySet--> + + + <!-- resources --> + <dependencySet> + <outputDirectory>resources/jbpm-jpdl-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-jpdl:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + <!--dependencySet> + <outputDirectory>resources/jbpm-enterprise-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-enterprise:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet--> + + </dependencySets> + + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <includes> + <include>jboss.eula.txt</include> + <include>license.txt</include> + <include>readme.html</include> + <include>release.notes.html</include> + </includes> + <outputDirectory></outputDirectory> + </fileSet> + <fileSet> + <directory>../api/target/site/apidocs</directory> + <outputDirectory>doc/javadocs</outputDirectory> + </fileSet> + <fileSet> + <directory>../api/target/schemadoc</directory> + <outputDirectory>doc/schemadoc</outputDirectory> + </fileSet> + <fileSet> + <directory>../db/target/create</directory> + <outputDirectory>db/create</outputDirectory> + </fileSet> + <fileSet> + <directory>../db/target/drop</directory> + <outputDirectory>db/drop</outputDirectory> + </fileSet> + <fileSet> + <directory>../devguide/target/docbook/publish/en</directory> + <outputDirectory>doc/devguide</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../userguide/target/docbook/publish/en</directory> + <outputDirectory>doc/userguide</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../api/target/schemadocs</directory> + <outputDirectory>doc/schemadocs</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../api/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../api/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../log/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../pvm/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../pvm/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../jpdl/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../jpdl/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../task/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../task/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../test-base/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/test/java</directory> + <outputDirectory>examples/src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/test/resources</directory> + <outputDirectory>examples/src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/eclipse</directory> + <outputDirectory>examples</outputDirectory> + </fileSet> + </fileSets> +</assembly> Property changes on: jbpm4/trunk/modules/distro/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/distro/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/distro/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Copied: jbpm4/trunk/modules/distro/src/main/resources/installer (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/installer) Property changes on: jbpm4/trunk/modules/distro/src/main/resources/installer ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/distro/src/main/resources/installer/ant-actions-spec.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/ant-actions-spec.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/ant-actions-spec.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,14 +0,0 @@ -<antactions> - <pack name="Download JBoss-5.0.0"> - <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> - <property name="install.path" value="$INSTALL_PATH"/> - <target name="download-jboss"/> - </antcall> - </pack> - <pack name="Download Eclipse-3.4.0"> - <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> - <property name="install.path" value="$INSTALL_PATH"/> - <target name="download-eclipse"/> - </antcall> - </pack> -</antactions> \ No newline at end of file Copied: jbpm4/trunk/modules/distro/src/main/resources/installer/ant-actions-spec.xml (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/ant-actions-spec.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/ant-actions-spec.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/ant-actions-spec.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,14 @@ +<antactions> + <pack name="Download JBoss-5.0.0"> + <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> + <property name="install.path" value="$INSTALL_PATH"/> + <target name="download-jboss"/> + </antcall> + </pack> + <pack name="Download Eclipse-3.4.0"> + <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> + <property name="install.path" value="$INSTALL_PATH"/> + <target name="download-eclipse"/> + </antcall> + </pack> +</antactions> \ No newline at end of file Deleted: jbpm4/trunk/modules/distro/src/main/resources/installer/auto-install-template.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/auto-install-template.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,34 +0,0 @@ -<AutomatedInstallation langpack="eng"> - <com.izforge.izpack.panels.HelloPanel /> - <com.izforge.izpack.panels.TargetPanel> - <installpath&gt;@user.home@/jbpm-jpdl-@product.version(a)&lt;/installpath&gt; - </com.izforge.izpack.panels.TargetPanel> - <com.izforge.izpack.panels.TreePacksPanel> - <pack name="jBPM4 Standalone" index="0" selected="true"/> - <pack name="jBPM4 JBoss Integration" index="1" selected="true"/> - <!--pack name="JSF-Console" index="2" selected="true"/> - <pack name="GWT-Console" index="3" selected="true"/--> - <pack name="Optional Components" index="4" selected="false"/> - <pack name="Download JBoss-5.0.0" index="5" selected="false"/> - <pack name="Download Eclipse-3.4.0" index="6" selected="false"/> - </com.izforge.izpack.panels.TreePacksPanel> - <com.izforge.izpack.panels.UserInputPanel> - <userInput> - <entry key="jbossTargetServer" value="default" /> - <entry key="jbossSelection" value=&quot;@jbpm.target.container(a)&quot; /> - </userInput> - </com.izforge.izpack.panels.UserInputPanel> - <com.izforge.izpack.panels.UserInputPanel> - <userInput> - <entry key="dbSelection" value="@database@"/> - </userInput> - </com.izforge.izpack.panels.UserInputPanel> - <com.izforge.izpack.panels.UserInputPanel> - <userInput> - <entry key="jbossInstallPath" value=&quot;@jboss.home(a)&quot; /> - </userInput> - </com.izforge.izpack.panels.UserInputPanel> - <com.izforge.izpack.panels.SummaryPanel /> - <com.izforge.izpack.panels.InstallPanel /> - <com.izforge.izpack.panels.FinishPanel /> -</AutomatedInstallation> Copied: jbpm4/trunk/modules/distro/src/main/resources/installer/auto-install-template.xml (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/auto-install-template.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/auto-install-template.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,34 @@ +<AutomatedInstallation langpack="eng"> + <com.izforge.izpack.panels.HelloPanel /> + <com.izforge.izpack.panels.TargetPanel> + <installpath&gt;@user.home@/jbpm-jpdl-@product.version(a)&lt;/installpath&gt; + </com.izforge.izpack.panels.TargetPanel> + <com.izforge.izpack.panels.TreePacksPanel> + <pack name="jBPM4 Standalone" index="0" selected="true"/> + <pack name="jBPM4 JBoss Integration" index="1" selected="true"/> + <!--pack name="JSF-Console" index="2" selected="true"/> + <pack name="GWT-Console" index="3" selected="true"/--> + <pack name="Optional Components" index="4" selected="false"/> + <pack name="Download JBoss-5.0.0" index="5" selected="false"/> + <pack name="Download Eclipse-3.4.0" index="6" selected="false"/> + </com.izforge.izpack.panels.TreePacksPanel> + <com.izforge.izpack.panels.UserInputPanel> + <userInput> + <entry key="jbossTargetServer" value="default" /> + <entry key="jbossSelection" value=&quot;@jbpm.target.container(a)&quot; /> + </userInput> + </com.izforge.izpack.panels.UserInputPanel> + <com.izforge.izpack.panels.UserInputPanel> + <userInput> + <entry key="dbSelection" value="@database@"/> + </userInput> + </com.izforge.izpack.panels.UserInputPanel> + <com.izforge.izpack.panels.UserInputPanel> + <userInput> + <entry key="jbossInstallPath" value=&quot;@jboss.home(a)&quot; /> + </userInput> + </com.izforge.izpack.panels.UserInputPanel> + <com.izforge.izpack.panels.SummaryPanel /> + <com.izforge.izpack.panels.InstallPanel /> + <com.izforge.izpack.panels.FinishPanel /> +</AutomatedInstallation> Deleted: jbpm4/trunk/modules/distro/src/main/resources/installer/download-helper.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/download-helper.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/download-helper.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id: download-helper.xml 3319 2008-12-10 14:29:01Z thomas.diesler(a)jboss.com $ --> -<project> - - <target name="download-jboss"> - <get src="http://downloads.sourceforge.net/jboss/jboss-5.0.0.GA.zip?modti... dest="${install.path}/Uninstaller/jboss-5.0.0.GA.zip" usetimestamp="true"/> - <unzip src="${install.path}/Uninstaller/jboss-5.0.0.GA.zip" dest="${install.path}"/> - </target> - <target name="download-eclipse"> - <get src="http://download.eclipse.org/technology/epp/downloads/release/ga... - dest="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" usetimestamp="true"/> - <untar src="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" dest="${install.path}" compression="gzip"/> - </target> - -</project> \ No newline at end of file Copied: jbpm4/trunk/modules/distro/src/main/resources/installer/download-helper.xml (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/download-helper.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/download-helper.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/download-helper.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id: download-helper.xml 3319 2008-12-10 14:29:01Z thomas.diesler(a)jboss.com $ --> +<project> + + <target name="download-jboss"> + <get src="http://downloads.sourceforge.net/jboss/jboss-5.0.0.GA.zip?modti... dest="${install.path}/Uninstaller/jboss-5.0.0.GA.zip" usetimestamp="true"/> + <unzip src="${install.path}/Uninstaller/jboss-5.0.0.GA.zip" dest="${install.path}"/> + </target> + <target name="download-eclipse"> + <get src="http://download.eclipse.org/technology/epp/downloads/release/ga... + dest="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" usetimestamp="true"/> + <untar src="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" dest="${install.path}" compression="gzip"/> + </target> + +</project> \ No newline at end of file Deleted: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,253 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?> -<installation version="1.0"> - <!-- - Ant properties in this file can be referenced with @{}, - otherwise use variables below in installer files with ${} - --> - <info> - <appname&gt;(a){product.name}&lt;/appname&gt; - <appversion&gt;(a){product.version}&lt;/appversion&gt; - <uninstaller name="remove.task" write="yes" /> - </info> - <guiprefs width="600" height="440" resizable="yes"> - <!-- - <laf name="kunststoff"> - <os family="unix" /> - </laf> - --> - </guiprefs> - <locale> - <langpack iso3="eng" /> - </locale> - - <!-- It is necessary to include everything needed, in this case ant self --> - <jar src=&quot;(a){deploy.artifacts.dir}/lib/ant.jar&quot; stage="both" /> - <jar src=&quot;(a){deploy.artifacts.dir}/lib/ant-launcher.jar&quot; stage="both" /> - - <!-- Setup the Ant Action Listener --> - <listeners> - <listener installer="AntActionInstallerListener" /> - </listeners> - - <!-- Resources --> - <resources> - <res id="AntActionsSpec.xml" src=&quot;(a){filtered.resources.dir}/ant-actions-spec.xml&quot; /> - <res id="userInputSpec.xml" src=&quot;(a){filtered.resources.dir}/user-input-spec.xml&quot; /> - <res id="TargetPanel.dir" src=&quot;(a){filtered.resources.dir}/target-panel-dir.txt&quot; /> - </resources> - - <!-- Variables --> - <variables> - <variable name="jboss422.home" value=&quot;(a){jboss422.home}&quot; /> - <variable name="jboss423.home" value=&quot;(a){jboss423.home}&quot; /> - <variable name="jboss500.home" value=&quot;(a){jboss500.home}&quot; /> - </variables> - - <!-- Dynamic Variables --> - <dynamicvariables> - <variable name="jboss.home" value="${jboss422.home}" condition="isJBoss422" /> - <variable name="jboss.home" value="${jboss423.home}" condition="isJBoss423" /> - <variable name="jboss.home" value="${jboss500.home}" condition="isJBoss500" /> - </dynamicvariables> - - <!-- Conditions --> - <conditions> - <!-- Target Server Conditions --> - <condition type="variable" id="isJBoss422"> - <name>jbossSelection</name> - <value>jboss422</value> - </condition> - <condition type="variable" id="isJBoss423"> - <name>jbossSelection</name> - <value>jboss423</value> - </condition> - <condition type="variable" id="isJBoss500"> - <name>jbossSelection</name> - <value>jboss500</value> - </condition> - - <!-- Target Database Conditions --> - <condition type="variable" id="isHypersonic"> - <name>dbSelection</name> - <value>hsqldb</value> - </condition> - <condition type="variable" id="isMySQL"> - <name>dbSelection</name> - <value>mysql</value> - </condition> - <condition type="variable" id="isPostgreSQL"> - <name>dbSelection</name> - <value>postgresql</value> - </condition> - <condition type="variable" id="isSybase"> - <name>dbSelection</name> - <value>sybase</value> - </condition> - </conditions> - - <!-- Panels --> - <panels> - <panel classname="HelloPanel" /> - <panel classname="TargetPanel" /> - <panel classname="TreePacksPanel" /> - <panel classname="UserInputPanel" /> - <panel classname="UserInputPanel" /> - <panel classname="UserInputPanel" /> - <panel classname="SummaryPanel" /> - <panel classname="InstallPanel" /> - <panel classname="FinishPanel" /> - </panels> - - <!-- Packs --> - <packs> - - <!-- - ******************************** - * * - * jBPM Standalone * - * * - ******************************** - --> - - <pack name="jBPM4 Standalone" required="yes" preselected="yes"> - <description>The jBPM4 Standalone Components</description> - - <!-- jbpm4/ --> - <file src=&quot;(a){deploy.artifacts.dir}/release.notes.html&quot; targetdir="$INSTALL_PATH" override="true" /> - <file src=&quot;(a){deploy.artifacts.dir}/jboss.eula.txt&quot; targetdir="$INSTALL_PATH" override="true" /> - - <!-- - jbpm4/config - --> - <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-jpdl-config.jar&quot; targetdir="$INSTALL_PATH/config" - unpack="true" override="true" /> - - <!-- - jbpm4/docs - --> - <!--file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook&quot; targetdir="$INSTALL_PATH/docs/userguide" unpack="true" override="true" /> - <fileset dir=&quot;(a){deploy.artifacts.dir}/javadoc&quot; targetdir="$INSTALL_PATH/docs" override="true"/--> - - <!-- - jbpm4/lib - --> - <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/lib" override="true"> - <include name="*.jar" /> - </fileset> - </pack> - - <!-- - ******************************** - * * - * JBoss Integration * - * * - ******************************** - --> - - <pack name="jBPM4 JBoss Integration" required="no" preselected="yes"> - - <description>The jBPM4 JBoss Integration</description> - - <!-- jbpm/jbpm-service.sar --> - <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> - <include name="hibernate.properties"/> - <include name="jbpm.cfg.xml"/> - <include name="logging.properties"/> - </fileset> - <!--fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-integration-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> - <include name="bpm-process-deployer.xml" /> - </fileset--> - <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> - <include name="jbpm-jpdl.jar" /> - <include name="jbpm-log.jar" /> - <include name="jbpm-pvm.jar" /> - <include name="jbpm-task.jar" /> - </fileset> - - <!-- jbpm/jbpm-enterprise.jar --> - <!--file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-enterprise.jar&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar" - unpack="true" override="true" /--> - - - <!-- jbpm/jbpm-userguide.war --> - <!--file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war" - unpack="true" override="true" /--> - - <!-- jbpm-destinations-service --> - <!--file src=&quot;(a){resources.dir}/destination/jbpm-destinations-service.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /--> - - <!-- Database configs to docs/examples/jbpm --> - <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config&quot; targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true"> - <include name="hibernate.cfg.hsqldb.xml"/> - <include name="hibernate.cfg.mysql.xml"/> - <include name="hibernate.cfg.postgresql.xml"/> - <include name="hibernate.cfg.sybase.xml"/> - <include name="jbpm-hsqldb-ds.xml"/> - <include name="jbpm-mysql-ds.xml"/> - <include name="jbpm-postgresql-ds.xml"/> - <include name="jbpm-sybase-ds.xml"/> - </fileset> - - <!-- Database Hypsersonic --> - <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml&quot; condition="isHypersonic" - target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - <!--fileset dir=&quot;(a){resources.dir}/database&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" condition="isHypersonic"> - <include name="hypersonic/jbpmDB.*" /> - </fileset--> - - <!-- Database MySQL --> - <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL"/> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml&quot; condition="isMySQL" - target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isMySQL"> - <include name="mysql-connector-java.jar" /> - </fileset> - - </pack> - - <!-- - ******************************** - * * - * GWT Console * - * * - ******************************** - --> - - <!--pack name="GWT-Console" parent="jbpm4 JBoss Integration" required="no" preselected="yes"> - <description>GWT-Console</description> - <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console.war&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" /> - <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console-server.war&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" /> - <file src=&quot;(a){deploy.artifacts.dir}/lib/report-server.war&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" /> - <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console-server-report.zip&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" /> - <file src=&quot;(a){deploy.artifacts.dir}/lib/report-engine.zip&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" /> - </pack--> - - <!-- - ******************************** - * * - * Optional Components * - * * - ******************************** - --> - - <pack name="Optional Components" required="no" preselected="no"> - <description>Optional jBPM4 Components</description> - </pack> - - <!-- JBoss-5.0.0 --> - <pack name="Download JBoss-5.0.0" required="no" parent="Optional Components" preselected="no"> - <description>Download and Install JBoss-5.0.0</description> - <!-- http://jira.codehaus.org/browse/IZPACK-158 --> - <file src=&quot;(a){resources.dir}/installer/download-helper.xml&quot; targetdir="$INSTALL_PATH/Uninstaller"/> - </pack> - - <!-- Eclipse-3.4.0 --> - <!--pack name="Download Eclipse-3.4.0" required="no" parent="Optional Components" preselected="no"> - <description>Download and Install Eclipse-3.4.0</description> - http://jira.codehaus.org/browse/IZPACK-158 - <file src=&quot;(a){resources.dir}/installer/download-helper.xml&quot; targetdir="$INSTALL_PATH/Uninstaller"/> - </pack--> - - </packs> -</installation> \ No newline at end of file Copied: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,253 @@ +<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?> +<installation version="1.0"> + <!-- + Ant properties in this file can be referenced with @{}, + otherwise use variables below in installer files with ${} + --> + <info> + <appname&gt;(a){product.name}&lt;/appname&gt; + <appversion&gt;(a){product.version}&lt;/appversion&gt; + <uninstaller name="remove.task" write="yes" /> + </info> + <guiprefs width="600" height="440" resizable="yes"> + <!-- + <laf name="kunststoff"> + <os family="unix" /> + </laf> + --> + </guiprefs> + <locale> + <langpack iso3="eng" /> + </locale> + + <!-- It is necessary to include everything needed, in this case ant self --> + <jar src=&quot;(a){deploy.artifacts.dir}/lib/ant.jar&quot; stage="both" /> + <jar src=&quot;(a){deploy.artifacts.dir}/lib/ant-launcher.jar&quot; stage="both" /> + + <!-- Setup the Ant Action Listener --> + <listeners> + <listener installer="AntActionInstallerListener" /> + </listeners> + + <!-- Resources --> + <resources> + <res id="AntActionsSpec.xml" src=&quot;(a){filtered.resources.dir}/ant-actions-spec.xml&quot; /> + <res id="userInputSpec.xml" src=&quot;(a){filtered.resources.dir}/user-input-spec.xml&quot; /> + <res id="TargetPanel.dir" src=&quot;(a){filtered.resources.dir}/target-panel-dir.txt&quot; /> + </resources> + + <!-- Variables --> + <variables> + <variable name="jboss422.home" value=&quot;(a){jboss422.home}&quot; /> + <variable name="jboss423.home" value=&quot;(a){jboss423.home}&quot; /> + <variable name="jboss500.home" value=&quot;(a){jboss500.home}&quot; /> + </variables> + + <!-- Dynamic Variables --> + <dynamicvariables> + <variable name="jboss.home" value="${jboss422.home}" condition="isJBoss422" /> + <variable name="jboss.home" value="${jboss423.home}" condition="isJBoss423" /> + <variable name="jboss.home" value="${jboss500.home}" condition="isJBoss500" /> + </dynamicvariables> + + <!-- Conditions --> + <conditions> + <!-- Target Server Conditions --> + <condition type="variable" id="isJBoss422"> + <name>jbossSelection</name> + <value>jboss422</value> + </condition> + <condition type="variable" id="isJBoss423"> + <name>jbossSelection</name> + <value>jboss423</value> + </condition> + <condition type="variable" id="isJBoss500"> + <name>jbossSelection</name> + <value>jboss500</value> + </condition> + + <!-- Target Database Conditions --> + <condition type="variable" id="isHypersonic"> + <name>dbSelection</name> + <value>hsqldb</value> + </condition> + <condition type="variable" id="isMySQL"> + <name>dbSelection</name> + <value>mysql</value> + </condition> + <condition type="variable" id="isPostgreSQL"> + <name>dbSelection</name> + <value>postgresql</value> + </condition> + <condition type="variable" id="isSybase"> + <name>dbSelection</name> + <value>sybase</value> + </condition> + </conditions> + + <!-- Panels --> + <panels> + <panel classname="HelloPanel" /> + <panel classname="TargetPanel" /> + <panel classname="TreePacksPanel" /> + <panel classname="UserInputPanel" /> + <panel classname="UserInputPanel" /> + <panel classname="UserInputPanel" /> + <panel classname="SummaryPanel" /> + <panel classname="InstallPanel" /> + <panel classname="FinishPanel" /> + </panels> + + <!-- Packs --> + <packs> + + <!-- + ******************************** + * * + * jBPM Standalone * + * * + ******************************** + --> + + <pack name="jBPM4 Standalone" required="yes" preselected="yes"> + <description>The jBPM4 Standalone Components</description> + + <!-- jbpm4/ --> + <file src=&quot;(a){deploy.artifacts.dir}/release.notes.html&quot; targetdir="$INSTALL_PATH" override="true" /> + <file src=&quot;(a){deploy.artifacts.dir}/jboss.eula.txt&quot; targetdir="$INSTALL_PATH" override="true" /> + + <!-- + jbpm4/config + --> + <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-jpdl-config.jar&quot; targetdir="$INSTALL_PATH/config" + unpack="true" override="true" /> + + <!-- + jbpm4/docs + --> + <!--file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook&quot; targetdir="$INSTALL_PATH/docs/userguide" unpack="true" override="true" /> + <fileset dir=&quot;(a){deploy.artifacts.dir}/javadoc&quot; targetdir="$INSTALL_PATH/docs" override="true"/--> + + <!-- + jbpm4/lib + --> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/lib" override="true"> + <include name="*.jar" /> + </fileset> + </pack> + + <!-- + ******************************** + * * + * JBoss Integration * + * * + ******************************** + --> + + <pack name="jBPM4 JBoss Integration" required="no" preselected="yes"> + + <description>The jBPM4 JBoss Integration</description> + + <!-- jbpm/jbpm-service.sar --> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> + <include name="hibernate.properties"/> + <include name="jbpm.cfg.xml"/> + <include name="logging.properties"/> + </fileset> + <!--fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-integration-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> + <include name="bpm-process-deployer.xml" /> + </fileset--> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> + <include name="jbpm-jpdl.jar" /> + <include name="jbpm-log.jar" /> + <include name="jbpm-pvm.jar" /> + <include name="jbpm-task.jar" /> + </fileset> + + <!-- jbpm/jbpm-enterprise.jar --> + <!--file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-enterprise.jar&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar" + unpack="true" override="true" /--> + + + <!-- jbpm/jbpm-userguide.war --> + <!--file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war" + unpack="true" override="true" /--> + + <!-- jbpm-destinations-service --> + <!--file src=&quot;(a){resources.dir}/destination/jbpm-destinations-service.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /--> + + <!-- Database configs to docs/examples/jbpm --> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config&quot; targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true"> + <include name="hibernate.cfg.hsqldb.xml"/> + <include name="hibernate.cfg.mysql.xml"/> + <include name="hibernate.cfg.postgresql.xml"/> + <include name="hibernate.cfg.sybase.xml"/> + <include name="jbpm-hsqldb-ds.xml"/> + <include name="jbpm-mysql-ds.xml"/> + <include name="jbpm-postgresql-ds.xml"/> + <include name="jbpm-sybase-ds.xml"/> + </fileset> + + <!-- Database Hypsersonic --> + <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml&quot; condition="isHypersonic" + target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + <!--fileset dir=&quot;(a){resources.dir}/database&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" condition="isHypersonic"> + <include name="hypersonic/jbpmDB.*" /> + </fileset--> + + <!-- Database MySQL --> + <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL"/> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml&quot; condition="isMySQL" + target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isMySQL"> + <include name="mysql-connector-java.jar" /> + </fileset> + + </pack> + + <!-- + ******************************** + * * + * GWT Console * + * * + ******************************** + --> + + <!--pack name="GWT-Console" parent="jbpm4 JBoss Integration" required="no" preselected="yes"> + <description>GWT-Console</description> + <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console.war&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" /> + <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console-server.war&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" /> + <file src=&quot;(a){deploy.artifacts.dir}/lib/report-server.war&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" /> + <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console-server-report.zip&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" /> + <file src=&quot;(a){deploy.artifacts.dir}/lib/report-engine.zip&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" /> + </pack--> + + <!-- + ******************************** + * * + * Optional Components * + * * + ******************************** + --> + + <pack name="Optional Components" required="no" preselected="no"> + <description>Optional jBPM4 Components</description> + </pack> + + <!-- JBoss-5.0.0 --> + <pack name="Download JBoss-5.0.0" required="no" parent="Optional Components" preselected="no"> + <description>Download and Install JBoss-5.0.0</description> + <!-- http://jira.codehaus.org/browse/IZPACK-158 --> + <file src=&quot;(a){resources.dir}/installer/download-helper.xml&quot; targetdir="$INSTALL_PATH/Uninstaller"/> + </pack> + + <!-- Eclipse-3.4.0 --> + <!--pack name="Download Eclipse-3.4.0" required="no" parent="Optional Components" preselected="no"> + <description>Download and Install Eclipse-3.4.0</description> + http://jira.codehaus.org/browse/IZPACK-158 + <file src=&quot;(a){resources.dir}/installer/download-helper.xml&quot; targetdir="$INSTALL_PATH/Uninstaller"/> + </pack--> + + </packs> +</installation> \ No newline at end of file Deleted: jbpm4/trunk/modules/distro/src/main/resources/installer/target-panel-dir.txt =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/target-panel-dir.txt 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/target-panel-dir.txt 2009-02-02 14:27:18 UTC (rev 3740) @@ -1 +0,0 @@ -$USER_HOME/jbpm-(a)product.version@ Copied: jbpm4/trunk/modules/distro/src/main/resources/installer/target-panel-dir.txt (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/target-panel-dir.txt) =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/target-panel-dir.txt (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/target-panel-dir.txt 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1 @@ +$USER_HOME/jbpm-(a)product.version@ Deleted: jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,34 +0,0 @@ -<userInput> - <panel order="0"> - <createForPack name="jBPM4 JBoss Integration" /> - <field type="radio" variable="jbossSelection"> - <description align="left" txt="Please choose your target server" /> - <spec> - <choice txt="JBoss-5.0.0" value="jboss500" set="true"/> - <choice txt="JBoss-4.2.3" value="jboss423"/> - <choice txt="JBoss-4.2.2" value="jboss422"/> - </spec> - </field> - <field type="text" variable="jbossTargetServer"> - <spec txt="Server:" size="15" set="default" /> - </field> - </panel> - <panel order="1"> - <createForPack name="jBPM4 JBoss Integration" /> - <field type="radio" variable="dbSelection"> - <description align="left" txt="Please choose your target database" /> - <spec> - <choice txt="Hypersonic" value="hsqldb"/> - <choice txt="MySQL" value="mysql" set="true"/> - <!-- choice txt="PostgreSQL" value="postgresql"/--> - <choice txt="Sybase" value="sybase"/> - </spec> - </field> - </panel> - <panel order="2"> - <createForPack name="jBPM4 JBoss Integration" /> - <field type="dir" align="left" variable="jbossInstallPath"> - <spec txt="JBoss Home:" size="25" set="${jboss.home}" /> - </field> - </panel> -</userInput> \ No newline at end of file Copied: jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,34 @@ +<userInput> + <panel order="0"> + <createForPack name="jBPM4 JBoss Integration" /> + <field type="radio" variable="jbossSelection"> + <description align="left" txt="Please choose your target server" /> + <spec> + <choice txt="JBoss-5.0.0" value="jboss500" set="true"/> + <choice txt="JBoss-4.2.3" value="jboss423"/> + <choice txt="JBoss-4.2.2" value="jboss422"/> + </spec> + </field> + <field type="text" variable="jbossTargetServer"> + <spec txt="Server:" size="15" set="default" /> + </field> + </panel> + <panel order="1"> + <createForPack name="jBPM4 JBoss Integration" /> + <field type="radio" variable="dbSelection"> + <description align="left" txt="Please choose your target database" /> + <spec> + <choice txt="Hypersonic" value="hsqldb"/> + <choice txt="MySQL" value="mysql" set="true"/> + <!-- choice txt="PostgreSQL" value="postgresql"/--> + <choice txt="Sybase" value="sybase"/> + </spec> + </field> + </panel> + <panel order="2"> + <createForPack name="jBPM4 JBoss Integration" /> + <field type="dir" align="left" variable="jbossInstallPath"> + <spec txt="JBoss Home:" size="25" set="${jboss.home}" /> + </field> + </panel> +</userInput> \ No newline at end of file Copied: jbpm4/trunk/modules/distro/src/main/resources/release.notes.html (from rev 3739, jbpm4/branches/hbraun/modules/distro/src/main/resources/release.notes.html) =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/release.notes.html (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/release.notes.html 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,87 @@ +<body><h1>jBPM-4.0.0-SNAPSHOT Release Notes</h1> +<!--h3>Bug</h3> +<ul> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1716">JBPM-171...>] - NPE in Transition.fireSuperStateEnterEvents() when destination is null </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1756">JBPM-175...>] - NullPointerException using bcc recipients in org.jbpm.mail.Mail </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1778">JBPM-177...>] - Empty map variables on process creation is set as null </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1811">JBPM-181...>] - JmsMessageTest fails intermitently on HSQLDB </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1829">JBPM-182...>] - Sybase transaction log full - dump needed </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1830">JBPM-183...>] - Fix AppServerConfigurationsTest for sybase on jboss500 </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1913">JBPM-191...>] - Support JBoss AS 5.0 for JSF Console </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1921">JBPM-192...>] - getGroupTaskList(List actorids) behaviour changed </li> +</ul> +<p> </p> +<h3>Feature Request</h3> +<ul> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1888">JBPM-188...>] - Allow unlocking Token without knowing the lock owner </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1909">JBPM-190...>] - Fix SubjectAuthenticationService </li> +</ul> +<p> </p> +<h3>Quality Risk</h3> +<ul> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1765">JBPM-176...>] - Unclosed InputStream in org.jbpm.util.ClassLoaderUtil.getProperties </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1887">JBPM-188...>] - ExceptionHandler may cause infinite loop </li> +</ul> +<p> </p> +<h3>Task</h3> +<ul> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1303">JBPM-130...>] - Add installer support for jboss-5.0.0 </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1764">JBPM-176...>] - Deadlocks make job execution tests fail on Sybase </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1775">JBPM-177...>] - verify if collection exceptionHandlers can be loaded lazy </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1814">JBPM-181...>] - make jbpm installation in jboss optional </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1816">JBPM-181...>] - Sanitize tests that leak JDBC connections </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1819">JBPM-181...>] - re-enable the standard configuration </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1823">JBPM-182...>] - re-enable the datbase upgrade tool </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1824">JBPM-182...>] - Investigate core test failures against Sybase </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1831">JBPM-183...>] - Provide a start/stop script for sybase </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1843">JBPM-184...>] - Revert to jbpm-3.2.2 schema and provide a defined migration path </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1852">JBPM-185...>] - Fix sporadic MailTest failure </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1854">JBPM-185...>] - Update to jbpm-gpd-3.1.6 </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1855">JBPM-185...>] - Release jBPM 3.3.1 GA </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1856">JBPM-185...>] - Support API-1.0.0 Alpha3 on jBPM3 </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1866">JBPM-186...>] - add javadocs to installer </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1883">JBPM-188...>] - Provide an initial implementation of an AS4 deployer </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1884">JBPM-188...>] - Provide an initial implementation of an AS5 deployer </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1894">JBPM-189...>] - Check jBPM library versions </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1902">JBPM-190...>] - Add support for JBoss-5.0.0.GA </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1904">JBPM-190...>] - Add toString() to Commands </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1905">JBPM-190...>] - Improve Commands </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1919">JBPM-191...>] - Ensure backward compatibility of the API </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1920">JBPM-192...>] - Include SOA-P overlays in jbpm build </li> +<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1932">JBPM-193...>] - Release the JSF Console 3.3.1.GA </li> +</ul> +<h3>Known limitations</h3> +<h3>XML editing in the process designer</h3> +<p>Direct editing of XML can lead to crashes in the graphical designer. This will be fixed in one of the next releases. Before you start editing the process XML source, make sure you create a backup copy.</p> +<h3>Transition buttons in task forms</h3> +<p>When generating a task form for a task, the transitions are not automatically populated in the generation dialog. Users have to enter the transition names and the button labels manually. If you don't do this no transition buttons will be generated to complete the task in the task form.</p> +<p><strong>Workaround</strong>: First option is to add the transition buttons in the task form generation dialog. If you generated a task form without transition buttons, you still can complete the task with the console. Just save the variables in the task form and then in the 'Views' menu, select 'Transitions'. There you can click the 'end task' link for each of the available transitions.</p> +<h3>Security vulnerability for GPD deployment</h3> +<p>In the suite distribution, the console that is deployed in the server contains a servlet that allows the designer to deploy processes directly to a running server. This servlet is unprotected and people could load any process into a default installation. <a href="https://jira.jboss.org/jira/browse/GPD-278">[GPD-278]&... +<h3>Excluded test cases</h3> +<p> </p> +<p><strong>Core tests, HSQLDB</strong></p> +<p> </p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p>&lt;!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema --&gt;</p><p>&lt;exclude&gt;org/jbpm/db/JbpmSchemaDbTest.java&lt;/exclude&gt;</p></pre> +<p> </p> +<p><strong>Core tests - MySQL</strong></p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p>&lt;!-- [JBPM-1166] SEAM timer transaction integration --&gt;<br />&lt;exclude&gt;org/jbpm/seam/JobExecutorCustomizationTest.java&lt;/exclude&gt;<br />&lt;!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema --&gt;<br />&lt;exclude&gt;org/jbpm/db/JbpmSchemaDbTest.java&lt;/exclude&gt;</p></pre> +<p> </p> +<p><strong>Core test, Sybase</strong></p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p>&lt;!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema --&gt;<br />&lt;exclude&gt;org/jbpm/db/JbpmSchemaDbTest.java&lt;/exclude&gt;</p></pre> +<p> </p> +<p><strong>Enterprise tests - HSQLDB</strong></p> +<p> </p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p>&lt;!-- [JBPM-1708] Enterprise EjbSchedulerTest fails --&gt;</p><p>&lt;exclude&gt;org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java&lt;/exclude&gt;</p></pre> +<p> </p> +<p><strong>Enterprise tests, Sybase</strong></p> +<p> </p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p>&lt;!-- [JBPM-1818] Use Sybase instance that supports XA Transaction --&gt;<br />&lt;exclude&gt;org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java&lt;/exclude&gt;<br />&lt;exclude&gt;org/jbpm/persistence/jta/JtaDbPersistenceTest.java&lt;/exclude&gt;<br />&lt;exclude&gt;org/jbpm/msg/jms/JmsMessageTest.java&lt;/exclude&gt;</p></pre> +<p> </p> +<p> </p> +<p><strong>Examples tests, Sybase</strong></p> +<p> </p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p>&lt;!-- [JBPM-1827] Investigate example test failures against Sybase --&gt;</p><p>&lt;exclude&gt;org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java&lt;/exclude&gt;</p></pre> +<p> </p--> + +</body> \ No newline at end of file Property changes on: jbpm4/trunk/modules/enterprise ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Copied: jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml (from rev 3739, jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml) =================================================================== --- jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml (rev 0) +++ jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,327 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jbpm4-toplevel" /> + <orderEntry type="module-library"> + <library name="M2 Dep: cargo:cargo:jar:0.5:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cargo/cargo/0.5/cargo-0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: cactus:cactus:jar:13-1.7.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus/13-1.7.1/cactus-13-1.7.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: nekohtml:nekohtml:jar:0.9.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: xerces:xercesImpl:jar:2.6.2:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: aspectj:aspectjrt:jar:1.2.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/aspectj/aspectjrt/1.2.1/aspectjrt-1.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-httpclient:commons-httpclient:jar:2.0.2:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: cactus:cactus-ant:jar:13-1.7.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus-ant/13-1.7.1/cactus-ant-13-1.7.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: rhino:js:jar:1.5R4.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: ant:ant:jar:1.5.4:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/ant/ant/1.5.4/ant-1.5.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jtidy:jtidy:jar:4aug2000r7-dev:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: httpunit:httpunit:jar:1.6:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: xerces:xmlParserAPIs:jar:2.2.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xmlParserAPIs/2.2.1/xmlParserAPIs-2.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.springframework:spring:jar:2.5.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Modified: jbpm4/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm4/trunk/modules/enterprise/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/enterprise/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- ====================================================================== --> - <!-- --> - <!-- JBoss, the OpenSource J2EE webOS --> - <!-- --> - <!-- Distributable under LGPL license. --> - <!-- See terms of license at http://www.gnu.org. --> - <!-- --> - <!-- ====================================================================== --> +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> - <!-- $Id$ --> +<!-- $Id$ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>jBPM 4 - Enterprise</name> @@ -43,9 +43,9 @@ <!-- Test Dependencies --> <dependency> - <groupId>cactus</groupId> - <artifactId>cactus</artifactId> - <scope>test</scope> + <groupId>cactus</groupId> + <artifactId>cactus</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.client</groupId> @@ -56,12 +56,12 @@ <!-- Plugins --> <build> - <testResources> - <testResource> - <filtering>true</filtering> - <directory>src/test/resources</directory> - </testResource> - </testResources> + <testResources> + <testResource> + <filtering>true</filtering> + <directory>src/test/resources</directory> + </testResource> + </testResources> <plugins> <plugin> @@ -89,6 +89,20 @@ </descriptors> </configuration> </execution> + <execution> + <id>assembly-enterprise-config</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.build.finalName}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-config.xml</descriptor> + </descriptors> + </configuration> + </execution> </executions> </plugin> Property changes on: jbpm4/trunk/modules/enterprise/scripts ___________________________________________________________________ Name: svn:ignore + *.iml Copied: jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml (from rev 3739, jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-config.xml) =================================================================== --- jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml (rev 0) +++ jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,17 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>config</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>jbpm-*-ds.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Modified: jbpm4/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml =================================================================== --- jbpm4/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -16,9 +16,9 @@ <include>aspectj:aspectjrt:jar</include> <include>cactus:cactus</include> <include>junit:junit</include> - <include>org.jbpm.jbpm4:jbpm-api</include> + <!--include>org.jbpm.jbpm4:jbpm-api</include> <include>org.jbpm.jbpm4:jbpm-pvm</include> - <include>org.jbpm.jbpm4:jbpm-log</include> + <include>org.jbpm.jbpm4:jbpm-log</include--> </includes> <unpack>false</unpack> <scope>test</scope> Property changes on: jbpm4/trunk/modules/enterprise/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/main/resources/META-INF ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/resources/META-INF ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/enterprise/src/test/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/enterprise/src/test/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,6 +0,0 @@ -hibernate.connection.datasource java\:comp/env/jdbc/JbpmDataSource -hibernate.transaction.factory_class org.hibernate.transaction.JTATransactionFactory -hibernate.transaction.manager_lookup_class org.hibernate.transaction.JBossTransactionManagerLookup -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -hibernate.format_sql true -hibernate.use_sql_comments true Property changes on: jbpm4/trunk/modules/examples ___________________________________________________________________ Name: svn:ignore - target + *.iml Copied: jbpm4/trunk/modules/examples/jbpm4-examples.iml (from rev 3739, jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml) =================================================================== --- jbpm4/trunk/modules/examples/jbpm4-examples.iml (rev 0) +++ jbpm4/trunk/modules/examples/jbpm4-examples.iml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,254 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jbpm4-toplevel" /> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:jbossesb-rosetta:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/jbossesb-rosetta/4.4.0.GA/jbossesb-rosetta-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: stax:stax-api:jar:1.0.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: stax:stax:jar:1.2.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jboss.jbossts:jbossts-common:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.springframework:spring:jar:2.5.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Modified: jbpm4/trunk/modules/examples/pom.xml =================================================================== --- jbpm4/trunk/modules/examples/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/examples/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -29,29 +29,62 @@ <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-api</artifactId> + <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> </dependency> - <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-base</artifactId> <version>${version}</version> </dependency> - - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jpdl</artifactId> - <version>${version}</version> - </dependency> - - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-pvm</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack.jbpm.db</id> + <phase>generate-test-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + <classifier>config</classifier> + <overWrite>true</overWrite> + </artifactItem> + </artifactItems> + <excludeTransitive>true</excludeTransitive> + <outputDirectory>target/jpdl-config</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>install.hibernate.database.properties</id> + <phase>generate-test-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy file="target/jpdl-config/hibernate.cfg.${database}.xml" + tofile="target/test-classes/examples-hibernate.cfg.xml" + overwrite="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Property changes on: jbpm4/trunk/modules/examples/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/eclipse ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/states ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/examples/src/test/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/examples/src/test/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,11 +0,0 @@ -hibernate.dialect org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class org.hsqldb.jdbcDriver -hibernate.connection.url jdbc:hsqldb:mem:. -hibernate.connection.username sa -hibernate.connection.password -hibernate.hbm2ddl.auto create-drop -hibernate.cache.use_second_level_cache true -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -# hibernate.show_sql true -# hibernate.format_sql true -# hibernate.use_sql_comments true Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -25,19 +25,7 @@ <standard-transaction-interceptor /> </command-service> - <hibernate-configuration> - <properties resource="hibernate.properties" /> - <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> - <mapping resource="jbpm.pvm.wire.hbm.xml" /> - <mapping resource="jbpm.pvm.definition.hbm.xml" /> - <mapping resource="jbpm.pvm.execution.hbm.xml" /> - <mapping resource="jbpm.pvm.variable.hbm.xml" /> - <mapping resource="jbpm.pvm.job.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <cache-configuration resource="jbpm.pvm.cache.xml" - usage="nonstrict-read-write" /> - </hibernate-configuration> + <hibernate-configuration resource="examples-hibernate.cfg.xml"/> <hibernate-session-factory /> Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/processinstance ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/esb ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/sequence ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/states ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Modified: jbpm4/trunk/modules/jpdl/pom.xml =================================================================== --- jbpm4/trunk/modules/jpdl/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/jpdl/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- ====================================================================== --> - <!-- --> - <!-- JBoss, the OpenSource J2EE webOS --> - <!-- --> - <!-- Distributable under LGPL license. --> - <!-- See terms of license at http://www.gnu.org. --> - <!-- --> - <!-- ====================================================================== --> +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> - <!-- $Id: pom.xml 1790 2008-07-31 12:13:06Z tom.baeyens(a)jboss.com $ --> +<!-- $Id: pom.xml 1790 2008-07-31 12:13:06Z tom.baeyens(a)jboss.com $ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -35,6 +35,8 @@ <!-- Dependencies --> <dependencies> + + <!-- JBPM4 --> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-pvm</artifactId> @@ -45,6 +47,8 @@ <artifactId>jbpm-task</artifactId> <version>${version}</version> </dependency> + + <!-- 3rd Party --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -61,16 +65,87 @@ <!-- Plugins --> <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <excludes> + <exclude>hibernate.*</exclude> + <exclude>jbpm.cfg.xml</exclude> + <exclude>jbpm-*-ds.xml</exclude> + <exclude>db.properties/**</exclude> + <exclude>logging.properties</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="database" value="${database}" /> + <ant antfile="scripts/antrun-jbpm-config.xml" target="concat" /> + </tasks> + </configuration> + </execution> + <!--execution> + <id>generate-db-scripts</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> + <ant antfile="scripts/build.schema.xml" target="create-schema" /> + </tasks> + </configuration> + </execution--> + </executions> + </plugin> + + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> <!-- https://jira.jboss.org/jira/browse/JBPM-1759 --> - <exclude>**/*.java</exclude> + <exclude>org/jbpm/jpdl/controlflow/DecisionExpressionTest.java</exclude> + <exclude>org/jbpm/jpdl/controlflow/DecisionHandlerTest.java</exclude> + <exclude>org/jbpm/jpdl/parsing/JpdlSchemaTest.java</exclude> + <exclude>org/jbpm/jpdl/parsing/ProcessParsingTest.java</exclude> + <exclude>org/jbpm/jpdl/parsing/TransitionParsingTest.java</exclude> </excludes> </configuration> </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.build.finalName}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-config.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> Property changes on: jbpm4/trunk/modules/jpdl/scripts ___________________________________________________________________ Name: svn:ignore + *.iml Copied: jbpm4/trunk/modules/jpdl/scripts/antrun-jbpm-config.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/scripts/antrun-jbpm-config.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/scripts/antrun-jbpm-config.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/scripts/antrun-jbpm-config.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id: antrun-jbpm-config.xml 3602 2009-01-08 04:27:48Z alex.guizar(a)jboss.com $ --> + +<project default="concat"> + + <property name="project.build.directory" value="${basedir}/target"/> + <property name="build.resources.directory" value="${basedir}/target/classes"/> + + <macrodef name="macro-disable"> + <attribute name="file" /> + <attribute name="section" /> + <sequential> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacetoken> + <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacevalue> + </replace> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> + <replacevalue><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> + </replace> + </sequential> + </macrodef> + + <macrodef name="macro-enable"> + <attribute name="file" /> + <attribute name="section" /> + <sequential> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacetoken> + <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacevalue> + </replace> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> + <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> + </replace> + </sequential> + </macrodef> + + <macrodef name="macro-database-cfg"> + <attribute name="database" /> + <sequential> + + <available property=&quot;(a){database}.properties.available&quot; file=&quot;${build.resources.directory}/hibernate.properties.(a){database}.xml&quot;/&gt; + <fail message=&quot;hibernate.properties.(a){database}.xml not available" unless=&quot;(a){database}.properties.available&quot;/&gt; + + <echo message="Concat hibernate.cfg.(a){database}.xml using hibernate.properties.(a){database}.xml, hibernate.mapping.(a){database}.xml&quot; /> + + <!-- Concat hibernate.cfg.xml --> + <concat destfile=&quot;${project.build.directory}/classes/hibernate.cfg.(a){database}.xml&quot;&gt; + <header><![CDATA[<?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> +]]></header> + <fileset file=&quot;${build.resources.directory}/hibernate.properties.(a){database}.xml&quot; /> + <fileset file="${build.resources.directory}/hibernate.common.xml" /> + <fileset file=&quot;${build.resources.directory}/hibernate.mapping.(a){database}.xml&quot; /> + <fileset file="${build.resources.directory}/hibernate.mapping.default.xml" /> + <fileset file="${build.resources.directory}/hibernate.cache.xml" /> + <footer><![CDATA[ </session-factory> +</hibernate-configuration>]]></footer> + </concat> + </sequential> + </macrodef> + + <target name="concat" > + <macro-database-cfg database="db2" /> + <macro-database-cfg database="derby" /> + <macro-database-cfg database="firebird" /> + <macro-database-cfg database="hsqldb"/> + <macro-database-cfg database="ingres" /> + <macro-database-cfg database="interbase" /> + <macro-database-cfg database="mckoi" /> + <macro-database-cfg database="mssql" /> + <macro-database-cfg database="mysql"/> + <macro-database-cfg database="postgresql"/> + <macro-database-cfg database="sapdb" /> + <macro-database-cfg database="sybase"/> + <macro-database-cfg database="oracle" /> + <macro-database-cfg database="postgresql" /> + + <echo message="Copy hibernate.cfg.${database}.xml to hibernate.cfg.xml" /> + <copy file="${project.build.directory}/classes/hibernate.cfg.${database}.xml" tofile="${project.build.directory}/classes/hibernate.cfg.xml"/> + + <loadfile property="hibernate.properties.xml" srcFile="${build.resources.directory}/hibernate.properties.${database}.xml"/> + <echo message="${hibernate.properties.xml}"/> + <echo/> + + </target> + +</project> \ No newline at end of file Copied: jbpm4/trunk/modules/jpdl/scripts/assembly-config.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/scripts/assembly-config.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/scripts/assembly-config.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,21 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>config</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>jbpm.cfg.xml</include> + <include>logging.properties</include> + <include>hibernate.cfg.xml</include> + <include>hibernate.cfg.*.xml</include> + <include>jbpm-*-ds.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Copied: jbpm4/trunk/modules/jpdl/scripts/build.schema.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/scripts/build.schema.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/scripts/build.schema.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/scripts/build.schema.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ============================================================ --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ============================================================ --> + +<!-- $Id: antrun-jbpmschema.xml 2999 2008-11-19 16:16:01Z thomas.diesler(a)jboss.com $ --> + +<project> + + <!-- ================================================================== --> + <!-- jBPM Database schema --> + <!-- ================================================================== --> + + <target name="create-schema"> + <echo message="${maven.runtime.classpath}"/> + + <taskdef name="schemaexport" + classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"> + <classpath path="${maven.runtime.classpath}"/> + </taskdef> + + <property name="cfg" value="target/classes/hibernate.cfg.xml" /> + + <mkdir dir="target/classes/create"/> + <mkdir dir="target/classes/drop"/> + + <schemaexport properties="target/classes/db.properties/hsqldb.properties" + output="target/classes/create/jbpm.hsqldb.create.sql" + create="yes" drop="no" config="${cfg}" text="yes" /> + <schemaexport properties="target/classes/db.properties/hsqldb.properties" + output="target/classes/drop/jbpm.hsqldb.drop.sql" + create="no" drop="yes" config="${cfg}" text="yes" /> + + <schemaexport properties="target/classes/db.properties/mysql.properties" + output="target/classes/create/jbpm.mysql.create.sql" + delimiter=";" + create="yes" drop="no" config="${cfg}" text="yes" /> + <schemaexport properties="target/classes/db.properties/mysql.properties" + output="target/classes/drop/jbpm.mysql.drop.sql" + delimiter=";" + create="no" drop="yes" config="${cfg}" text="yes" /> + + <schemaexport properties="target/classes/db.properties/oracle.properties" + output="target/classes/create/jbpm.oracle.create.sql" + create="yes" drop="no" config="${cfg}" text="yes" + delimiter=";" /> + <schemaexport properties="target/classes/db.properties/oracle.properties" + output="target/classes/drop/jbpm.oracle.drop.sql" + create="no" drop="yes" config="${cfg}" text="yes" + delimiter=";" /> + + <schemaexport properties="target/classes/db.properties/postgresql.properties" + output="target/classes/create/jbpm.postgresql.create.sql" + create="yes" drop="no" config="${cfg}" text="yes" /> + <schemaexport properties="target/classes/db.properties/postgresql.properties" + output="target/classes/drop/jbpm.postgresql.drop.sql" + create="no" drop="yes" config="${cfg}" text="yes" /> + + <schemaexport properties="target/classes/db.properties/sybase.properties" + output="target/classes/create/jbpm.sybase.create.sql" + create="yes" drop="no" config="${cfg}" text="yes" /> + <schemaexport properties="target/classes/db.properties/sybase.properties" + output="target/classes/drop/jbpm.sybase.drop.sql" + create="no" drop="yes" config="${cfg}" text="yes" /> + + </target> + +</project> Property changes on: jbpm4/trunk/modules/jpdl/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/el ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/deploy ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/impl ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.cfg.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.cfg.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.cfg.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,20 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 2.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-2.0.dtd"> + +<hibernate-configuration> + + <session-factory> + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + </session-factory> + +</hibernate-configuration> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.common.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.common.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.common.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.common.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,41 @@ + + <!-- DataSource properties (begin) === + <property name="hibernate.connection.datasource">java:JbpmDS</property> + ==== DataSource properties (end) --> + + <!-- JTA transaction properties (begin) === + <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> + <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> + <property name="jta.UserTransaction">UserTransaction</property> + ==== JTA transaction properties (end) --> + + <!-- CMT transaction properties (begin) === + <property name="hibernate.transaction.factory_class">org.hibernate.transaction.CMTTransactionFactory</property> + <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> + ==== CMT transaction properties (end) --> + + <!-- ################################### --> + <!-- # common settings # --> + <!-- ################################### --> + + <!-- Automatic schema creation (begin) --> + <property name="hibernate.hbm2ddl.auto">create</property> + <!-- Automatic schema creation (end) --> + + <!-- Simple memory-only cache --> + <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> + + <!-- logging properties --> + <property name="hibernate.format_sql">true</property> + <property name="hibernate.use_sql_comments">true</property> + + <!-- Common hibernate mapping used with jpdl --> + + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.db2.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.db2.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.db2.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.db2.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.DB2Dialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://www-128.ibm.com/developerworks/db2/downloads/jcc --> + <property name="hibernate.connection.driver_class">com.ibm.db2.jcc.DB2Driver</property> + <property name="hibernate.connection.url">jdbc:db2://localhost:50000/testing</property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.derby.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.derby.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.derby.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.derby.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.DerbyDialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://db.apache.org/derby --> + <property name="hibernate.connection.driver_class">org.apache.derby.jdbc.EmbeddedDriver</property> + <property name="hibernate.connection.url">jdbc:derby:build/derby/jbpmtest;create=true</property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.FirebirdDialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://firebird.sourceforge.net/ --> + <property name="hibernate.connection.driver_class">org.firebirdsql.jdbc.FBDriver</property> + <property name="hibernate.connection.url">jdbc:firebirdsql:localhost:jbpmtest</property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,11 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + + <!-- JDBC connection properties (begin) --> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:jbpm</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.IngresDialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://google.com --> + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.InterbaseDialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://google.com --> + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.MckoiDialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://google.com --> + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.SQLServerDialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://msdn.microsoft.com/data/jdbc --> + <property name="hibernate.connection.driver_class">net.sourceforge.jtds.jdbc.Driver</property> + <property name="hibernate.connection.url">jdbc:jtds:sqlserver://localhost:1433/jbpmtest</property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,11 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property> + + <!-- JDBC connection properties (begin) --> + <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property> + <property name="hibernate.connection.url">${jdbc.mysql.url}</property> + <property name="hibernate.connection.username">${jdbc.mysql.username}</property> + <property name="hibernate.connection.password">${jdbc.mysql.password}</property> + <property name="hibernate.query.substitutions">true 1, false 0</property> + <!-- JDBC connection properties (end) --> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://www.oracle.com --> + <property name="hibernate.connection.driver_class">oracle.jdbc.driver.OracleDriver</property> + <property name="hibernate.connection.url">${jdbc.oracle.url}</property> + <property name="hibernate.connection.username">${jdbc.oracle.username}</property> + <property name="hibernate.connection.password">${jdbc.oracle.password}</property> + <!-- JDBC connection properties (end) --> + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,11 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> + + <!-- JDBC connection properties (begin) --> + <property name="hibernate.connection.driver_class">org.postgresql.Driver</property> + <property name="hibernate.connection.url">${jdbc.postgresql.url}</property> + <property name="hibernate.connection.username">${jdbc.postgresql.username}</property> + <property name="hibernate.connection.password">${jdbc.postgresql.password}</property> + <!-- JDBC connection properties (end) --> + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.SAPDBDialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://google.com --> + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Copied: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,23 @@ + <!-- + Out-of-the-box compatibility with Sybase + https://jira.jboss.org/jira/browse/JBPM-700 + + System Service QA Database Sybase + https://wiki.corp.jboss.com/bin/composite/IT/SystemServiceQaDatabaseSybase + + Install Sybase ASE 15.0.2 on Fedora9 + https://www.jboss.org/community/docs/DOC-12932 + --> + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property> + + <!-- JDBC connection properties (begin) --> + <property name="hibernate.connection.driver_class">${jdbc.sybase.driver}</property> + <property name="hibernate.connection.url">${jdbc.sybase.url}</property> + <property name="hibernate.connection.username">${jdbc.sybase.username}</property> + <property name="hibernate.connection.password">${jdbc.sybase.password}</property> + <!-- JDBC connection properties (end) --> + + <!-- jConnect does not support retrieving natively generated keys after insert --> + <property name="hibernate.jdbc.use_get_generated_keys">false</property> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <local-tx-datasource> + <jndi-name>JbpmDS</jndi-name> + + <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbpmDB</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + + <!-- connection pool parameters --> + <min-pool-size>1</min-pool-size> + <max-pool-size>5</max-pool-size> + + <!-- disable idle connection removal, hsqldb does not reap threads on closed connections --> + <idle-timeout-minutes>0</idle-timeout-minutes> + <!-- check all statements are closed when the connection is returned to the pool --> + <track-statements /> + <!-- hsqldb benefits from prepared statement caching --> + <prepared-statement-cache-size>32</prepared-statement-cache-size> + + <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml --> + <metadata> + <type-mapping>Hypersonic SQL</type-mapping> + </metadata> + + <!-- ensure the datasource is not initialized before the database itself --> + <depends>jboss:service=Hypersonic,database=jbpmDB</depends> + </local-tx-datasource> + + <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbpmDB"> + <attribute name="Database">jbpmDB</attribute> + <attribute name="InProcessMode">true</attribute> + </mbean> + +</datasources> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.mysql.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.mysql.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.mysql.database}</xa-datasource-property> + <user-name>${jdbc.mysql.username}</user-name> + <password>${jdbc.mysql.password}</password> + + <!-- reduce isolation from the default level (repeatable read) --> + <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> + <!-- separate connections used with and without JTA transaction --> + <no-tx-separate-pools /> + <!-- disable transaction interleaving --> + <track-connection-by-tx /> + + <!-- leverage mysql integration features --> + <exception-sorter-class-name> + com.mysql.jdbc.integration.jboss.ExtendedMysqlExceptionSorter + </exception-sorter-class-name> + <valid-connection-checker-class-name> + com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker + </valid-connection-checker-class-name> + + <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml --> + <metadata> + <type-mapping>mySQL</type-mapping> + </metadata> + </xa-datasource> + +</datasources> \ No newline at end of file Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.postgresql.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.postgresql.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.postgresql.database}</xa-datasource-property> + <user-name>${jdbc.postgresql.username}</user-name> + <password>${jdbc.postgresql.password}</password> + + <!-- disable transaction interleaving --> + <track-connection-by-tx /> + + <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml --> + <metadata> + <type-mapping>PostgreSQL 8.0</type-mapping> + </metadata> + </xa-datasource> + +</datasources> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>${jdbc.sybase.datasource}</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.sybase.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.sybase.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.sybase.database}</xa-datasource-property> + <user-name>${jdbc.sybase.username}</user-name> + <password>${jdbc.sybase.password}</password> + + <!-- disable transaction interleaving --> + <track-connection-by-tx /> + + <exception-sorter-class-name> + org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter + </exception-sorter-class-name> + + <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml --> + <metadata> + <type-mapping>Sybase</type-mapping> + </metadata> + </xa-datasource> + +</datasources> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine> + + <deployer-manager> + <assign-file-type> + <file extension=".jpdl.xml" type="jpdl" /> + </assign-file-type> + <parse-jpdl /> + <check-process /> + <check-problems /> + <save /> + </deployer-manager> + + <process-service /> + <execution-service /> + <management-service /> + <task-service /> + + <command-service> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> + + <hibernate-configuration> + <mapping resource="hibernate.cfg.xml"/> + <!--properties resource="hibernate.properties" /> + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <cache-configuration resource="jbpm.pvm.cache.xml" + usage="nonstrict-read-write" /--> + </hibernate-configuration> + + <hibernate-session-factory /> + + <job-executor auto-start="false" /> + <job-test-helper /> + + <id-generator /> + <types resource="jbpm.pvm.types.xml" /> + + <business-calendar> + <monday hours="9:00-12:00 and 12:30-17:00"/> + <tuesday hours="9:00-12:00 and 12:30-17:00"/> + <wednesday hours="9:00-12:00 and 12:30-17:00"/> + <thursday hours="9:00-12:00 and 12:30-17:00"/> + <friday hours="9:00-12:00 and 12:30-17:00"/> + <holiday period="01/07/2008 - 31/08/2008"/> + </business-calendar> + + </process-engine> + + <environment> + <hibernate-session /> + <transaction /> + <pvm-db-session /> + <job-db-session /> + <task-db-session /> + <message-session /> + <timer-session /> + </environment> + +</jbpm-configuration> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties (from rev 3739, jbpm4/branches/hbraun/modules/jpdl/src/main/resources/logging.properties) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/logging.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,28 @@ +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 = FINEST +java.util.logging.ConsoleHandler.formatter = org.jbpm.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=FINEST +org.jbpm.pvm.internal.tx.level=FINE +org.jbpm.pvm.internal.wire.level=FINE +org.jbpm.pvm.internal.util.level=FINE + +org.hibernate.level=FINEST +org.hibernate.cfg.HbmBinder.level=SEVERE +org.hibernate.cfg.SettingsFactory.level=SEVERE +# org.hibernate.SQL.level=FINEST +# org.hibernate.type.level=FINEST +# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST +# org.hibernate.transaction.level=FINEST Property changes on: jbpm4/trunk/modules/jpdl/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/jpdl/src/test/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,11 +0,0 @@ -hibernate.dialect org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class org.hsqldb.jdbcDriver -hibernate.connection.url jdbc:hsqldb:mem:. -hibernate.connection.username sa -hibernate.connection.password -hibernate.hbm2ddl.auto create-drop -hibernate.cache.use_second_level_cache true -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -# hibernate.show_sql true -hibernate.format_sql true -hibernate.use_sql_comments true Property changes on: jbpm4/trunk/modules/jpdl/src/test/resources/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/log ___________________________________________________________________ Name: svn:ignore - target + *.iml Property changes on: jbpm4/trunk/modules/log/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/log/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/log/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/log/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/log/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Modified: jbpm4/trunk/modules/pvm/pom.xml =================================================================== --- jbpm4/trunk/modules/pvm/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/pvm/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- ====================================================================== --> - <!-- --> - <!-- JBoss, the OpenSource J2EE webOS --> - <!-- --> - <!-- Distributable under LGPL license. --> - <!-- See terms of license at http://www.gnu.org. --> - <!-- --> - <!-- ====================================================================== --> +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> - <!-- $Id$ --> +<!-- $Id$ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>jBPM 4 - PVM</name> @@ -31,7 +31,7 @@ <!-- Properties --> <properties> <table.prefix>JBPM_</table.prefix> - <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> + <!--test.resources.directory>${project.build.directory}/test-resources</test.resources.directory--> </properties> <!-- Dependencies --> @@ -48,7 +48,7 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-base</artifactId> </dependency> - + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -59,11 +59,11 @@ </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-engine</artifactId> + <artifactId>juel-impl</artifactId> </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-impl</artifactId> + <artifactId>juel-engine</artifactId> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -107,7 +107,7 @@ <exclude>**/*TestCase.java</exclude> <!-- https://jira.jboss.org/jira/browse/JBPM-1965 --> - <exclude>**/NormalMessageTest.java</exclude> + <exclude>**/NormalMessageTest.java</exclude> </excludes> </configuration> </plugin> @@ -117,7 +117,7 @@ <!-- Profiles --> <profiles> </profiles> - + <reporting> <plugins> <plugin> @@ -127,10 +127,11 @@ <quiet>true</quiet> <source>1.5</source> <verbose>false</verbose> - <noqualifier>all</noqualifier> + <noqualifier>all</noqualifier> <excludePackageNames>*.internal:*.test</excludePackageNames> </configuration> </plugin> + </plugins> </reporting> Property changes on: jbpm4/trunk/modules/pvm/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding ___________________________________________________________________ Name: svn:ignore + *.iml Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java 2009-02-02 14:27:18 UTC (rev 3740) @@ -120,10 +120,34 @@ descriptor.setSchemaOperation(HibernateConfigurationDescriptor.UpdateSchema.getInstance()); } } - + + // [hb] parse external configuration file or use inlined elements + // but for no, it's one or the other to avoid side effects and overlays + if(element.hasAttribute("resource")) + { + parseConfigurationFile(element, descriptor); + log.info("Configuring form external resource "+element.getAttribute("resource")+ + ", skip inline configuration elements."); + } + else + { + parseInlineConfiguration(element, parse, descriptor, parser); + } + return descriptor; + } + + private void parseConfigurationFile(Element element, HibernateConfigurationDescriptor descriptor) + { + String hibernateConfigResource = element.getAttribute("resource"); + descriptor.setHibernateConfigResource(hibernateConfigResource); + + } + + private void parseInlineConfiguration(Element element, Parse parse, HibernateConfigurationDescriptor descriptor, Parser parser) + { List<Element> configElements = XmlUtil.elements(element); for (Element configElement: configElements) { - + if ("mappings".equals(XmlUtil.getTagLocalName(configElement))) { if (configElement.hasAttribute("resource")) { String resources = configElement.getAttribute("resource"); @@ -144,28 +168,28 @@ parse.addProblem("couldn't parse hibernate mapping resources '"+resources+"'", e); } } - + } else if ("mapping".equals(XmlUtil.getTagLocalName(configElement))) { - + parseMapping(configElement, descriptor, parse); - + } else if ("properties".equals(XmlUtil.getTagLocalName(configElement))) { PropertiesDescriptor propertiesDescriptor = (PropertiesDescriptor) propertiesBinding.parse(configElement, parse, parser); descriptor.setPropertiesDescriptor(propertiesDescriptor); - + } else if ("cache-configuration".equals(XmlUtil.getTagLocalName(configElement))) { StreamInput streamSource = null; - + String cacheUsage = configElement.getAttribute("usage"); if (! ( ("read-only".equals(cacheUsage)) - || ("nonstrict-read-write".equals(cacheUsage)) - || ("read-write".equals(cacheUsage)) - || ("transactional".equals(cacheUsage)) + || ("nonstrict-read-write".equals(cacheUsage)) + || ("read-write".equals(cacheUsage)) + || ("transactional".equals(cacheUsage)) ) ){ parse.addProblem("problem in cache-configuration: no usage attribute or illegal value: "+cacheUsage+" Possible values are {read-only, nonstrict-read-write, read-write, transactional}"); } else { - + if (configElement.hasAttribute("file")) { String fileName = configElement.getAttribute("file"); File file = new File(fileName); @@ -175,12 +199,12 @@ parse.addProblem("file "+fileName+" isn't a file"); } } - + if (configElement.hasAttribute("resource")) { String resource = configElement.getAttribute("resource"); streamSource = new ResourceStreamInput(resource, parse.getClassLoader()); } - + if (configElement.hasAttribute("url")) { String urlText = configElement.getAttribute("url"); try { @@ -190,22 +214,22 @@ parse.addProblem("couldn't open url "+urlText, e); } } - + if (streamSource != null) { parser.importStream(streamSource, configElement, parse); } - + // parse the cache configurations in the same way as the hibernate cfg schema // translate the contents of the file into invoke operations for methods // Configuration.setCacheConcurrencyStrategy(String clazz, String concurrencyStrategy, String region) - // Configuration.setCollectionCacheConcurrencyStrategy(String collectionRole, String concurrencyStrategy) + // Configuration.setCollectionCacheConcurrencyStrategy(String collectionRole, String concurrencyStrategy) // <class-cache class="org.hibernate.auction.Item" usage="read-write"/> // <class-cache class="org.hibernate.auction.Bid" usage="read-only"/> // <collection-cache collection="org.hibernate.auction.Item.bids" usage="read-write"/> List<Element> cacheElements = XmlUtil.elements(configElement); if (cacheElements!=null) { for (Element cacheElement : cacheElements) { - + if ("class-cache".equals(XmlUtil.getTagLocalName(cacheElement))) { String className = cacheElement.getAttribute("class"); descriptor.addCacheOperation(new HibernateConfigurationDescriptor.SetCacheConcurrencyStrategy(className, cacheUsage)); @@ -225,8 +249,6 @@ parse.addProblem("unknown hibernate configuration element "+XmlUtil.toString(configElement)); } } - - return descriptor; } } Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor ___________________________________________________________________ Name: svn:ignore + *.iml Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateConfigurationDescriptor.java 2009-02-02 14:27:18 UTC (rev 3740) @@ -21,6 +21,23 @@ */ package org.jbpm.pvm.internal.wire.descriptor; +import org.hibernate.JDBCException; +import org.hibernate.HibernateException; +import org.hibernate.cfg.Configuration; +import org.hibernate.connection.ConnectionProvider; +import org.hibernate.connection.ConnectionProviderFactory; +import org.hibernate.dialect.Dialect; +import org.hibernate.tool.hbm2ddl.DatabaseMetadata; +import org.hibernate.util.JDBCExceptionReporter; +import org.jbpm.JbpmException; +import org.jbpm.log.Log; +import org.jbpm.pvm.internal.util.ReflectUtil; +import org.jbpm.pvm.internal.wire.WireContext; +import org.jbpm.pvm.internal.wire.WireDefinition; +import org.jbpm.pvm.internal.wire.WireException; +import org.jbpm.pvm.internal.wire.operation.Operation; + +import java.io.InputStream; import java.net.URL; import java.sql.Connection; import java.sql.SQLException; @@ -30,29 +47,13 @@ import java.util.List; import java.util.Properties; -import org.jbpm.JbpmException; -import org.jbpm.log.Log; -import org.jbpm.pvm.internal.util.ReflectUtil; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.wire.WireDefinition; -import org.jbpm.pvm.internal.wire.WireException; -import org.jbpm.pvm.internal.wire.operation.Operation; - -import org.hibernate.JDBCException; -import org.hibernate.cfg.Configuration; -import org.hibernate.connection.ConnectionProvider; -import org.hibernate.connection.ConnectionProviderFactory; -import org.hibernate.dialect.Dialect; -import org.hibernate.tool.hbm2ddl.DatabaseMetadata; -import org.hibernate.util.JDBCExceptionReporter; - /** * @author Tom Baeyens */ public class HibernateConfigurationDescriptor extends AbstractDescriptor { - + private static final long serialVersionUID = 1L; - + private static final Log log = Log.getLog(HibernateConfigurationDescriptor.class.getName()); String className; @@ -62,32 +63,47 @@ PropertiesDescriptor propertiesDescriptor; private Operation schemaOperation; + // a hibernate xml config, i.e. hibernate.cfg.xml + private String hibernateConfigResource = null; + public Object construct(WireContext wireContext) { // instantiation of the configuration Configuration configuration = null; if (className!=null) { ClassLoader classLoader = wireContext.getClassLoader(); - log.trace("instantiating hibernate configation class "+className); + log.trace("instantiating hibernate configuration class "+className); Class<?> configurationClass = ReflectUtil.loadClass(classLoader, className); configuration = (Configuration) ReflectUtil.newInstance(configurationClass); } else { - log.trace("instantiating default hibernate configation"); + log.trace("instantiating default hibernate configuration"); configuration = new Configuration(); } return configuration; } - + public void initialize(Object object, WireContext wireContext) { + Configuration configuration = (Configuration) object; - apply(mappingOperations, configuration, wireContext); - apply(cacheOperations, configuration, wireContext); - if (propertiesDescriptor!=null) { - Properties properties = (Properties) wireContext.create(propertiesDescriptor, false); - if (log.isDebugEnabled()) log.debug("adding properties to hibernate configuration: "+properties); - configuration.addProperties(properties); + + // [hb] use one or the other for now, but don't mix external and inline configuration + if(hibernateConfigResource!=null) + { + configuration.configure(hibernateConfigResource); } - if (schemaOperation != null) { - schemaOperation.apply(configuration, wireContext); + else + { + apply(mappingOperations, configuration, wireContext); + apply(cacheOperations, configuration, wireContext); + + if (propertiesDescriptor!=null) { + Properties properties = (Properties) wireContext.create(propertiesDescriptor, false); + if (log.isDebugEnabled()) log.debug("adding properties to hibernate configuration: "+properties); + configuration.addProperties(properties); + } + + if (schemaOperation != null) { + schemaOperation.apply(configuration, wireContext); + } } } @@ -123,9 +139,31 @@ } cacheOperations.add(operation); } - + // operations /////////////////////////////////////////////////////////////// + /** + * Applies an external configuration (i.e. hibernate.cfg.xml) + */ + public static class ExternalConfiguration implements Operation { + private static final long serialVersionUID = 1L; + String resource; + public ExternalConfiguration(String resource) { + this.resource = resource; + } + public void apply(Object target, WireContext wireContext) { + Configuration configuration = (Configuration) target; + InputStream in = wireContext.getClassLoader().getResourceAsStream(resource); + if(null==in) + throw new IllegalArgumentException("No such resource " +resource); + configuration.addInputStream(in); + } + + public String toString() { + return "using external hibernate configuration "+resource; + } + } + public static class AddResource implements Operation { private static final long serialVersionUID = 1L; String resource; @@ -229,7 +267,7 @@ public static class CreateSchema implements Operation { private static final long serialVersionUID = 1L; - + /** The sole instance of this class */ private static final Operation instance = new CreateSchema(); @@ -273,7 +311,7 @@ public static class UpdateSchema implements Operation { private static final long serialVersionUID = 1L; - + private static final Operation instance = new UpdateSchema(); private UpdateSchema() { @@ -289,7 +327,7 @@ Connection connection = connectionProvider.getConnection(); try { DatabaseMetadata metadata = new DatabaseMetadata(connection, dialect); - String[] updateScript = configuration.generateSchemaUpdateScript(dialect, metadata); + String[] updateScript = configuration.generateSchemaUpdateScript(dialect, metadata); log.debug("updating db schema"); executeScript(connection, updateScript); } @@ -335,9 +373,9 @@ } return exceptions; } - + // getters and setters ////////////////////////////////////////////////////// - + public String getClassName() { return className; } @@ -362,4 +400,8 @@ public void setSchemaOperation(Operation schemaOperation) { this.schemaOperation = schemaOperation; } + public void setHibernateConfigResource(String hibernateConfigResource) + { + this.hibernateConfigResource = hibernateConfigResource; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionFactoryDescriptor.java 2009-02-02 14:27:18 UTC (rev 3740) @@ -31,6 +31,8 @@ import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; +import java.net.URL; + /** * @author Tom Baeyens */ @@ -58,7 +60,7 @@ if (configuration==null) { throw new WireException("couldn't find configuration"); } - + SessionFactory sessionFactory = configuration.buildSessionFactory(); wireContext.addListener(new SessionFactoryCloser(sessionFactory)); Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/cron ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/util ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/println ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/variables ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,11 +0,0 @@ -hibernate.dialect org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class org.hsqldb.jdbcDriver -hibernate.connection.url jdbc:hsqldb:mem:. -hibernate.connection.username sa -hibernate.connection.password -hibernate.hbm2ddl.auto create-drop -hibernate.cache.use_second_level_cache true -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -# hibernate.show_sql true -# hibernate.format_sql true -# hibernate.use_sql_comments true Copied: jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties (from rev 3739, jbpm4/branches/hbraun/modules/pvm/src/test/resources/hibernate.properties) =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties (rev 0) +++ jbpm4/trunk/modules/pvm/src/test/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,8 @@ +hibernate.dialect=org.hibernate.dialect.HSQLDialect +hibernate.connection.driver_class=org.hsqldb.jdbcDriver +hibernate.connection.url=jdbc:hsqldb:mem:. +hibernate.connection.username=sa +hibernate.connection.password= +hibernate.hbm2ddl.auto=create-drop +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/enterprise ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/enterprise/custom ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/embedded ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/variables ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Modified: jbpm4/trunk/modules/task/pom.xml =================================================================== --- jbpm4/trunk/modules/task/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/task/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- ====================================================================== --> - <!-- --> - <!-- JBoss, the OpenSource J2EE webOS --> - <!-- --> - <!-- Distributable under LGPL license. --> - <!-- See terms of license at http://www.gnu.org. --> - <!-- --> - <!-- ====================================================================== --> +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> - <!-- $Id$ --> +<!-- $Id$ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>jBPM 4 - Task</name> @@ -32,20 +32,9 @@ <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-api</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-log</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-test-base</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-pvm</artifactId> </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -56,11 +45,11 @@ </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-engine</artifactId> + <artifactId>juel-impl</artifactId> </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-impl</artifactId> + <artifactId>juel-engine</artifactId> </dependency> <dependency> <groupId>org.hibernate</groupId> Property changes on: jbpm4/trunk/modules/task/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/docs ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/cmd ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/hibernate ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/binding ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/session ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/task/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/task/src/test/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/task/src/test/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/task/src/test/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,11 +0,0 @@ -hibernate.dialect org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class org.hsqldb.jdbcDriver -hibernate.connection.url jdbc:hsqldb:mem:. -hibernate.connection.username sa -hibernate.connection.password -hibernate.hbm2ddl.auto create-drop -hibernate.cache.use_second_level_cache true -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -# hibernate.show_sql true -hibernate.format_sql true -hibernate.use_sql_comments true Property changes on: jbpm4/trunk/modules/test-base ___________________________________________________________________ Name: svn:ignore - target + *.iml Property changes on: jbpm4/trunk/modules/test-base/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-base/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-base/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-base/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db ___________________________________________________________________ Name: svn:ignore - target + *.iml Copied: jbpm4/trunk/modules/test-db/jpm4-test-db.iml (from rev 3739, jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml) =================================================================== --- jbpm4/trunk/modules/test-db/jpm4-test-db.iml (rev 0) +++ jbpm4/trunk/modules/test-db/jpm4-test-db.iml 2009-02-02 14:27:18 UTC (rev 3740) @@ -0,0 +1,254 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jbpm4-toplevel" /> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:jbossesb-rosetta:jar:4.4.0.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/jbossesb-rosetta/4.4.0.GA/jbossesb-rosetta-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: stax:stax-api:jar:1.0.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: stax:stax:jar:1.2.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jboss.jbossts:jbossts-common:jar:4.4.0.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.springframework:spring:jar:2.5.4:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel:jar:2.1.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Modified: jbpm4/trunk/modules/test-db/pom.xml =================================================================== --- jbpm4/trunk/modules/test-db/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/test-db/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -27,54 +27,79 @@ <!-- Dependencies --> <dependencies> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-api</artifactId> - <version>${version}</version> - </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-test-base</artifactId> - <version>${version}</version> - </dependency> - - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-task</artifactId> + <artifactId>jbpm-test-base</artifactId> <version>${version}</version> - <scope>test</scope> </dependency> - - <!-- TODO remove PVM dependency for compilation (keep it for test)--> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-pvm</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - + </dependencies> - + <!-- Plugins --> <build> <plugins> - <plugin> + <plugin> <!--TODO: What's this??--> <artifactId>maven-surefire-plugin</artifactId> <configuration> <testSourceDirectory>src/main/java</testSourceDirectory> <classesDirectory>target/classes</classesDirectory> - <testClassesDirectory>target/classes</testClassesDirectory> + <testClassesDirectory>target/classes</testClassesDirectory> </configuration> </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack.jbpm.db</id> + <phase>generate-test-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + <classifier>config</classifier> + <overWrite>true</overWrite> + </artifactItem> + </artifactItems> + <excludeTransitive>true</excludeTransitive> + <outputDirectory>target/jpdl-config</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>install.hibernate.database.properties</id> + <phase>generate-test-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy file="target/jpdl-config/hibernate.cfg.${database}.xml" + tofile="target/classes/testDb-hibernate.cfg.xml" + overwrite="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> - + </project> \ No newline at end of file Property changes on: jbpm4/trunk/modules/test-db/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-db/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/test-db/src/main/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/test-db/src/main/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/test-db/src/main/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,11 +0,0 @@ -hibernate.dialect org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class org.hsqldb.jdbcDriver -hibernate.connection.url jdbc:hsqldb:mem:. -hibernate.connection.username sa -hibernate.connection.password -hibernate.hbm2ddl.auto create-drop -hibernate.cache.use_second_level_cache true -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -# hibernate.show_sql true -# hibernate.format_sql true -# hibernate.use_sql_comments true Modified: jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -25,19 +25,7 @@ <standard-transaction-interceptor /> </command-service> - <hibernate-configuration> - <properties resource="hibernate.properties" /> - <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> - <mapping resource="jbpm.pvm.wire.hbm.xml" /> - <mapping resource="jbpm.pvm.definition.hbm.xml" /> - <mapping resource="jbpm.pvm.execution.hbm.xml" /> - <mapping resource="jbpm.pvm.variable.hbm.xml" /> - <mapping resource="jbpm.pvm.job.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <cache-configuration resource="jbpm.pvm.cache.xml" - usage="nonstrict-read-write" /> - </hibernate-configuration> + <hibernate-configuration resource="testDb-hibernate.cfg.xml"/> <hibernate-session-factory /> Property changes on: jbpm4/trunk/modules/test-load ___________________________________________________________________ Name: svn:ignore - target + *.iml Property changes on: jbpm4/trunk/modules/test-load/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/main/parked ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/main/scripts ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Deleted: jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,16 +0,0 @@ -hibernate.dialect=org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class=org.hsqldb.jdbcDriver -hibernate.connection.url=jdbc:hsqldb:mem:. -hibernate.connection.username=sa -hibernate.connection.password= - -hibernate.hbm2ddl.auto=create-drop - -hibernate.cache.use_second_level_cache=true -hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider - -# hibernate.jdbc.batch_size=1 - -# hibernate.show_sql true -# hibernate.format_sql true -# hibernate.use_sql_comments true Property changes on: jbpm4/trunk/modules/test-load/src/test/resources/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/load ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/test-pojo/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Property changes on: jbpm4/trunk/modules/userguide/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide/src/main/diagrams ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide/src/main/diagrams/bpmn ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide/src/main/docbook ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide/src/main/docbook/en ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide/src/main/docbook/en/images ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules ___________________________________________________________________ Name: svn:ignore + *.iml Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- ====================================================================== --> - <!-- --> - <!-- JBoss, the OpenSource J2EE webOS --> - <!-- --> - <!-- Distributable under LGPL license. --> - <!-- See terms of license at http://www.gnu.org. --> - <!-- --> - <!-- ====================================================================== --> +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> - <!-- $Id$ --> +<!-- $Id$ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -30,27 +30,30 @@ <!-- Modules --> <modules> + <module>modules/log</module> <module>modules/api</module> + <module>modules/pvm</module> <module>modules/examples</module> - <module>modules/enterprise</module> <module>modules/jpdl</module> - <module>modules/log</module> - <module>modules/pvm</module> <module>modules/task</module> + <!--module>modules/enterprise</module--> <module>modules/test-base</module> <module>modules/test-db</module> - <module>modules/test-pojo</module> + <!--module>modules/test-pojo</module--> </modules> <!-- Properties --> <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <apache.ant.version>1.7.0</apache.ant.version> <cactus.version>13-1.7.1</cactus.version> <hibernate.version>3.2.6.ga</hibernate.version> <hsqldb.version>1.8.0.7</hsqldb.version> + <izpack.version>4.1.0</izpack.version> <jboss.j2ee.version>4.2.2.GA</jboss.j2ee.version> <jbossesb.version>4.4.0.GA</jbossesb.version> <jboss.client.version>4.2.2.GA</jboss.client.version> - <jsr233.version>2.0.3</jsr233.version> + <jsr233.version>2.0.5</jsr233.version> <juel.version>2.1.0</juel.version> <junit.version>3.8.1</junit.version> <log4j.version>1.2.14</log4j.version> @@ -82,9 +85,31 @@ <artifactId>jbpm-pvm</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-db</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.livetribe</groupId> + <artifactId>livetribe-jsr223</artifactId> + <version>${jsr233.version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-gpd</artifactId> + <type>zip</type> + <version>${version}</version> + </dependency> + <!-- Please sort by groupid --> <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>${apache.ant.version}</version> + </dependency> + <dependency> <groupId>cactus</groupId> <artifactId>cactus</artifactId> <version>${cactus.version}</version> @@ -100,6 +125,11 @@ <version>${hsqldb.version}</version> </dependency> <dependency> + <groupId>izpack</groupId> + <artifactId>standalone-compiler</artifactId> + <version>${izpack.version}</version> + </dependency> + <dependency> <groupId>jboss</groupId> <artifactId>jboss-j2ee</artifactId> <version>${jboss.j2ee.version}</version> @@ -126,12 +156,12 @@ </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-engine</artifactId> + <artifactId>juel-impl</artifactId> <version>${juel.version}</version> </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-impl</artifactId> + <artifactId>juel-engine</artifactId> <version>${juel.version}</version> </dependency> <dependency> @@ -140,11 +170,6 @@ <version>${junit.version}</version> </dependency> <dependency> - <groupId>org.livetribe</groupId> - <artifactId>livetribe-jsr223</artifactId> - <version>${jsr233.version}</version> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>${log4j.version}</version> @@ -184,6 +209,12 @@ <!-- Plugins --> <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -229,6 +260,17 @@ </systemProperties> </configuration> </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> <!-- PluginManagement --> @@ -274,10 +316,10 @@ <!-- Profiles --> <profiles> + <profile> <id>distro</id> <modules> - <module>modules/db</module> <module>modules/devguide</module> <module>modules/distro</module> <module>modules/userguide</module> @@ -297,7 +339,6 @@ <profile> <id>load</id> <modules> - <module>modules/db</module> <module>modules/test-load</module> </modules> </profile> @@ -316,134 +357,51 @@ </build> </profile> + <!-- + Name: no-database + Descr: Setup the default database + --> <profile> - <id>database</id> + <id>no-database</id> <activation> <property> - <name>database</name> + <name>!database</name> </property> </activation> + <properties> + <database>hsqldb</database> + </properties> <dependencies> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-db</artifactId> - <version>${version}</version> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> + </profile> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack.jbpm.db</id> - <phase>validate</phase> - <goals> - <goal>unpack-dependencies</goal> - </goals> - <configuration> - <includeArtifactIds>jbpm-db</includeArtifactIds> - <excludeTransitive>true</excludeTransitive> - <outputDirectory>target/jbpm-db</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>resolve props</id> - <phase>compile</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>target/resolved.properties</outputDirectory> - <resources> - <resource> - <directory>target/jbpm-db/db.properties</directory> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>install.hibernate.database.properties</id> - <phase>compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <mkdir dir="target/test-classes" /> - <copy file="target/resolved.properties/${database}.properties" - tofile="target/test-classes/hibernate.properties" - overwrite="true" /> - </tasks> - </configuration> - </execution> - <execution> - <id>create.schema</id> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property file="target/test-classes/hibernate.properties" /> - <sql src="target/jbpm-db/drop/jbpm.${database}.drop.sql" - driver="${hibernate.connection.driver_class}" url="${hibernate.connection.url}" - userid="${hibernate.connection.username}" password="${hibernate.connection.password}" - onerror="continue"> - <classpath> - <path refid="maven.test.classpath" /> - </classpath> - </sql> - <sql src="target/jbpm-db/create/jbpm.${database}.create.sql" - driver="${hibernate.connection.driver_class}" url="${hibernate.connection.url}" - userid="${hibernate.connection.username}" password="${hibernate.connection.password}" - onerror="continue"> - <classpath> - <path refid="maven.test.classpath" /> - </classpath> - </sql> - </tasks> - </configuration> - </execution> - <execution> - <id>drop.schema</id> - <phase>prepare-package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property file="target/test-classes/hibernate.properties" /> - <sql src="target/jbpm-db/drop/jbpm.${database}.drop.sql" - driver="${hibernate.connection.driver_class}" url="${hibernate.connection.url}" - userid="${hibernate.connection.username}" password="${hibernate.connection.password}"> - <classpath> - <path refid="maven.test.classpath" /> - </classpath> - </sql> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <!-- + Name: hsqldb + Descr: Hypersonic Database Setup + --> + <profile> + <id>hsqldb</id> + <activation> + <property> + <name>database</name> + <value>hsqldb</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </profile> + <!-- -Ddatabase=oracle --> <profile> <id>oracle</id> Modified: jbpm4/trunk/profiles.xml.example =================================================================== --- jbpm4/trunk/profiles.xml.example 2009-02-02 13:49:27 UTC (rev 3739) +++ jbpm4/trunk/profiles.xml.example 2009-02-02 14:27:18 UTC (rev 3740) @@ -1,12 +1,66 @@ -<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" +<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd"> <profiles> - + <!-- This profile can also be defined in ~/.m2/settings.xml --> - + <profile> + <id>jboss-home-profile</id> + <activation> + <property> + <name>user.name</name> + </property> + </activation> + <properties> + + <!-- + JBOSS_HOME FOR INTEGRATION TESTS + --> + + <jboss422.home>/Users/hbraun/dev/prj/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> + <jboss423.home>/Users/hbraun/dev/prj/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home> + <jboss500.home>/Users/hbraun/dev/prj/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home> + + <!-- + DEFAULT CONNECTION SETTINGS FOR THE JBPM QA ENV + --> + + <jdbc.hsql.server>localhost</jdbc.hsql.server> + <jdbc.hsql.port>3306</jdbc.hsql.port> + <jdbc.hsql.database>jbpmtest</jdbc.hsql.database> + <jdbc.hsql.url>jdbc:hsqldb:mem:.</jdbc.hsql.url> + <jdbc.hsql.username>sa</jdbc.hsql.username> + <jdbc.hsql.password></jdbc.hsql.password> + + <jdbc.mysql.server>localhost</jdbc.mysql.server> + <jdbc.mysql.port>3306</jdbc.mysql.port> + <jdbc.mysql.database>jbpm4</jdbc.mysql.database> + <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url> + <jdbc.mysql.username>jbpmtest</jdbc.mysql.username> + <jdbc.mysql.password></jdbc.mysql.password> + + <jdbc.postgresql.server>localhost</jdbc.postgresql.server> + <jdbc.postgresql.port>5432</jdbc.postgresql.port> + <jdbc.postgresql.database>jbpm4</jdbc.postgresql.database> + <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> + <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username> + <jdbc.postgresql.password></jdbc.postgresql.password> + + <jdbc.sybase.server>localhost</jdbc.sybase.server> + <jdbc.sybase.port>5000</jdbc.sybase.port> + <jdbc.sybase.database>jbpm4</jdbc.sybase.database> + <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url> + <jdbc.sybase.username>jbpmtest</jdbc.sybase.username> + <jdbc.sybase.password>jbpmtest</jdbc.sybase.password> + <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> + <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> + + </properties> + </profile> + + <profile> <id>oracle-private-properties</id> <activation> <property> @@ -37,7 +91,7 @@ <jdbc.dbname>JBPM</jdbc.dbname> </properties> </profile> - + </profiles> </profilesXml>