[jbpm-commits] JBoss JBPM SVN: r4636 - in jbpm4/trunk: modules/distro/scripts and 54 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-04-27 09:09:07 -0400 (Mon, 27 Apr 2009) New Revision: 4636 Added: jbpm4/trunk/modules/distro/src/main/deployer/ jbpm4/trunk/modules/distro/src/main/deployer/config.jboss4/ jbpm4/trunk/modules/distro/src/main/deployer/config.jboss4/deploy/ jbpm4/trunk/modules/distro/src/main/deployer/config.jboss4/deploy/jbpm/ jbpm4/trunk/modules/distro/src/main/deployer/config.jboss4/deploy/jbpm/jbpm-service.sar/ jbpm4/trunk/modules/distro/src/main/deployer/config.jboss4/deploy/jbpm/jbpm-service.sar/META-INF/ jbpm4/trunk/modules/distro/src/main/deployer/config.jboss4/deploy/jbpm/jbpm-service.sar/META-INF/jboss-service.xml jbpm4/trunk/modules/distro/src/main/deployer/config.jboss5/ jbpm4/trunk/modules/distro/src/main/deployer/config.jboss5/bootstrap/ jbpm4/trunk/modules/distro/src/main/deployer/config.jboss5/bootstrap/deployers.xml jbpm4/trunk/modules/distro/src/main/deployer/config.jboss5/deployers/ jbpm4/trunk/modules/distro/src/main/deployer/config.jboss5/deployers/jbpm.deployer/ jbpm4/trunk/modules/distro/src/main/deployer/config.jboss5/deployers/jbpm.deployer/META-INF/ jbpm4/trunk/modules/distro/src/main/deployer/config.jboss5/deployers/jbpm.deployer/META-INF/jbpm-deployers-jboss-beans.xml jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-destinations-service.xml jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/ejb-jar.xml jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/jboss.xml jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/jbosscmp-jdbc.xml jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/META-INF/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/META-INF/jboss-service.xml jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss4/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss4/deploy/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss4/deploy/jbpm/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss4/deploy/jbpm/jbpm-service.sar/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss4/deploy/jbpm/jbpm-service.sar/jboss-beans.xml jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deploy/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deploy/jbpm/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deploy/jbpm/jbpm-service.sar/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deploy/jbpm/jbpm-service.sar/jbpm-service-jboss-beans.xml jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/ jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.cfg.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.tx.hibernate.cfg.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.tx.jta.cfg.xml jbpm4/trunk/modules/test-load/src/test/resources/jbpm.hibernate.cfg.xml Removed: jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-destinations-service.xml jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.enterprise.wire.bindings.xml jbpm4/trunk/modules/integration/console/scripts/assembly-config.xml jbpm4/trunk/modules/integration/console/src/main/resources/jboss-service.xml jbpm4/trunk/modules/integration/jboss4/scripts/assembly-config.xml jbpm4/trunk/modules/integration/jboss5/scripts/assembly-config.xml jbpm4/trunk/modules/integration/jboss5/src/main/resources/META-INF/ jbpm4/trunk/modules/integration/jboss5/src/main/resources/deployers.xml jbpm4/trunk/modules/integration/spi/scripts/assembly-config.xml jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm.cfg.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml Modified: jbpm4/trunk/modules/distro/pom.xml jbpm4/trunk/modules/distro/scripts/assembly-distro.xml jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml jbpm4/trunk/modules/enterprise/pom.xml jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/jta/JtaTransactionInterceptor.java jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/JtaTransactionInterceptorBinding.java jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/integration/console/pom.xml jbpm4/trunk/modules/integration/jboss4/pom.xml jbpm4/trunk/modules/integration/jboss5/pom.xml jbpm4/trunk/modules/integration/spi/pom.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.wire.bindings.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml jbpm4/trunk/qa/build.xml Log: distribution and qa test run updates Modified: jbpm4/trunk/modules/distro/pom.xml =================================================================== --- jbpm4/trunk/modules/distro/pom.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/distro/pom.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -35,11 +35,6 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-enterprise</artifactId> - <classifier>config</classifier> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-examples</artifactId> </dependency> <dependency> @@ -51,32 +46,15 @@ <artifactId>jbpm-console-integration</artifactId> <version>${version}</version> </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-console-integration</artifactId> - <classifier>config</classifier> - <version>${version}</version> - </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jboss4</artifactId> <version>${version}</version> </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jboss4</artifactId> - <classifier>config</classifier> - <version>${version}</version> - </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jboss5</artifactId> </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jboss5</artifactId> - <classifier>config</classifier> - </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jpdl</artifactId> @@ -100,12 +78,6 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spi</artifactId> - <classifier>config</classifier> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-db</artifactId> </dependency> @@ -210,40 +182,6 @@ </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.test.classpath" refid="maven.test.classpath" /> - <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}" /> - <property name="user.dir" value="${user.dir}" /> - - <ant antfile="scripts/antrun-installer.xml" target="build-installer" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin --> - </plugins> </build> Modified: jbpm4/trunk/modules/distro/scripts/assembly-distro.xml =================================================================== --- jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -6,7 +6,6 @@ <id>jbpm.distribution</id> <finalName>jbpm-${version}</finalName> - <formats> <format>zip</format> </formats> @@ -57,47 +56,6 @@ <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> <outputDirectory>gpd</outputDirectory> </dependencySet> - <!-- resources --> - <dependencySet> - <outputDirectory>jboss/jbpm-enterprise-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-enterprise:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>jboss/jbpm-spi-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-spi:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>jboss/jbpm-console-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-console-integration:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>jboss/jbpm-jboss5-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-jboss5:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>jboss/jbpm-jboss4-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-jboss4:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> </dependencySets> <fileSets> Added: jbpm4/trunk/modules/distro/src/main/deployer/config.jboss4/deploy/jbpm/jbpm-service.sar/META-INF/jboss-service.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/deployer/config.jboss4/deploy/jbpm/jbpm-service.sar/META-INF/jboss-service.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/deployer/config.jboss4/deploy/jbpm/jbpm-service.sar/META-INF/jboss-service.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- $Id: jboss-service.xml 44143 2006-04-24 18:19:21Z kkhan $ --> + +<!-- ===================================================================== --> +<!-- JBoss Server Configuration --> +<!-- ===================================================================== --> + +<server> + + <mbean code="org.jbpm.integration.jboss4.JBPMDeployer" + name="org.jbpm:service=JBPMDeployer"> + </mbean> + +</server> Property changes on: jbpm4/trunk/modules/distro/src/main/deployer/config.jboss4/deploy/jbpm/jbpm-service.sar/META-INF/jboss-service.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/deployer/config.jboss5/bootstrap/deployers.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/deployer/config.jboss5/bootstrap/deployers.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/deployer/config.jboss5/bootstrap/deployers.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,237 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + The base deployers +--> +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <classloader><inject bean="deployers-classloader:0.0.0"/></classloader> + + <classloader name="deployers-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"> + <root>${jboss.lib.url}jboss-deployers-core-spi.jar</root> + <root>${jboss.lib.url}jboss-deployers-core.jar</root> + <root>${jboss.lib.url}jboss-deployers-client-spi.jar</root> + <root>${jboss.lib.url}jboss-deployers-client.jar</root> + <root>${jboss.lib.url}jboss-deployers-structure-spi.jar</root> + <root>${jboss.lib.url}jboss-deployers-spi.jar</root> + <root>${jboss.lib.url}jboss-deployers-impl.jar</root> + <root>${jboss.lib.url}jboss-deployers-vfs-spi.jar</root> + <root>${jboss.lib.url}jboss-deployers-vfs.jar</root> + + <!-- JAXB impl here, api is in endorsed --> + <root>${jboss.lib.url}jaxb-impl.jar</root> + <!-- STAX2 impl here, api is in endorsed --> + <root>${jboss.lib.url}wstx.jar</root> + </classloader> + + <!-- use legacy ordering --> + <bean name="topContextComparator"> + <constructor factoryClass="org.jboss.system.deployers.LegacyDeploymentContextComparator" factoryMethod="getInstance"/> + </bean> + + <!-- The ManagedObjectFactory --> + <bean name="ManagedObjectFactory"> + <constructor factoryClass="org.jboss.managed.api.factory.ManagedObjectFactory" factoryMethod="getInstance"/> + <!-- Accept any implementor of InstanceClassFactory --> + <incallback method="addInstanceClassFactory"/> + <uncallback method="removeInstanceClassFactory"/> + <!-- Accept any ManagedObjectDefinition --> + <incallback method="addManagedObjectDefinition"/> + <uncallback method="removeManagedObjectDefinition"/> + </bean> + <!-- The ManagedObjectCreator implementation --> + <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator"> + <property name="mof"><inject bean="ManagedObjectFactory"/></property> + </bean> + + <!-- The MainDeployer --> + <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl"> + <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property> + <property name="deployers"><inject bean="Deployers"/></property> + <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property> + <property name="comparator"><inject bean="topContextComparator"/></property> + </bean> + + <!-- The ManagedDeploymentCreator implementation that supports mapping + attachment types to ManagedDeployment#getTypes + --> + <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.TypedManagedDeploymentCreator" /> + + <!-- The holder for deployers that determine structure --> + <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl"> + <property name="structureBuilder"> + <!-- The consolidator of the structure information --> + <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/> + </property> + <!-- Accept any implementor of structure deployer --> + <incallback method="addDeployer"/> + <uncallback method="removeDeployer"/> + </bean> + + <!-- The holder for deployers that do real deployment --> + <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl"> + <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.deployment:service=DeployersImpl", exposedInterface=org.jboss.deployers.plugins.deployers.DeployersImplMBean.class, registerDirectly=true)</annotation> + <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor> + <!-- Accept any implementor of deployer --> + <incallback method="addDeployer"/> + <uncallback method="removeDeployer"/> + <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property> + </bean> + + <!-- A declared structure descriptor deployer --> + <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/> + + <!-- JAR Structure --> + <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure"> + <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar, .war, .sar, .har, .aop --> + <constructor> + <parameter> + <set elementClass="java.lang.String"> + <value>.zip</value> + <value>.ear</value> + <value>.jar</value> + <value>.rar</value> + <value>.war</value> + <value>.sar</value> + <value>.har</value> + <value>.aop</value> + <value>.deployer</value> + <value>.beans</value> + + <!-- FIXME remove this once JBAS-6274 is done --> + <value>.spring</value> + <value>.rails</value> + <value>.esb</value> + <value>.jpdl</value> + </set> + </parameter> + </constructor> + <property name="candidateStructureVisitorFactory"> + <!-- Any file that is not an ordinary directory is a candidate --> + <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory"> + <!-- A filter to exclude some obvious non-subdeployments --> + <property name="filter"> + <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter"> + <constructor><parameter> + <list elementClass="java.lang.String"> + <!-- Exclude class files as subdeployments --> + <value>.class</value> + </list> + </parameter></constructor> + </bean> + </property> + </bean> + </property> + </bean> + + <!-- File Structure --> + <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure"> + <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml --> + <constructor> + <parameter> + <set elementClass="java.lang.String"> + <value>-service.xml</value> + <value>-beans.xml</value> + <value>-ds.xml</value> + <value>-aop.xml</value> + </set> + </parameter> + </constructor> + </bean> + + <!-- Old AOP deployment + <bean name="AspectAppParsingDeployer" class="org.jboss.aop.asintegration.jboss5.AspectAppParsingDeployer"/> + <bean name="AspectDeployer" class="org.jboss.aop.asintegration.jboss5.AspectDeployer"> + <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property> + </bean> + --> + + <bean name="AOPXMLMetaDataParserDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer"> + <constructor> + <parameter>org.jboss.aop.microcontainer.beans.metadata.AOPDeployment</parameter> + </constructor> + <property name="suffix">-aop.xml</property> + </bean> + <bean name="AOPAnnotationMetaDataParserDeployer" class="org.jboss.aop.asintegration.jboss5.AOPAnnotationMetaDataParserDeployer"> + <constructor> + <parameter><inject bean="AOPXMLMetaDataParserDeployer" property="relativeOrder"/></parameter> + </constructor> + </bean> + <bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer"> + <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property> + </bean> + <bean name="AOPDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.AOPDeploymentAopMetaDataDeployer"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property> + </bean> + <bean name="BeansDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.BeansDeploymentAopMetaDataDeployer"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property> + </bean> + + <!-- POJO Deployment --> + <bean name="BeanMetaDataICF" class="org.jboss.deployers.plugins.managed.BeanMetaDataICF"> + <property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property> + </bean> + <bean name="KernelDeploymentManagedObjectCreator" class="org.jboss.deployers.plugins.managed.KernelDeploymentManagedObjectCreator"> + <constructor><parameter><inject bean="ManagedObjectFactory"/></parameter></constructor> + </bean> + <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer"> + <property name="suffix">jboss-beans.xml</property> + </bean> + <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"> + <install bean="ManagedDeploymentCreator" method="addAttachmentType"> + <parameter> + <value>org.jboss.kernel.spi.deployment.KernelDeployment</value> + </parameter> + <parameter> + <value>beans</value> + </parameter> + </install> + <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType"> + <parameter> + <value>org.jboss.kernel.spi.deployment.KernelDeployment</value> + </parameter> + </uninstall> + <property name="mgtObjectCreator"><inject bean="KernelDeploymentManagedObjectCreator"/></property> + </bean> + <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer"> + <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor> + </bean> + + <!-- JMX Deployment --> + <bean name="ServiceMetaDataICF" class="org.jboss.system.deployers.managed.ServiceMetaDataICF"> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer"> + </bean> + <bean name="ServiceClassLoaderDeployer" class="org.jboss.system.deployers.ServiceClassLoaderDeployer"/> + <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer"> + </bean> + <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer"> + <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor> + </bean> + + <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer"> + <constructor> + <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter> + </constructor> + <property name="name">jboss-classloading.xml</property> + <property name="buildManagedObject">true</property> + </bean> + <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer"> + <property name="defaultMetaData"> + <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/> + </property> + </bean> + <bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/> + <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/> + <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer"> + <property name="classLoading"><inject bean="ClassLoading"/></property> + </bean> + <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer"> + <property name="classLoading"><inject bean="ClassLoading"/></property> + <property name="system"><inject bean="ClassLoaderSystem"/></property> + </bean> + +</deployment> Property changes on: jbpm4/trunk/modules/distro/src/main/deployer/config.jboss5/bootstrap/deployers.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/deployer/config.jboss5/deployers/jbpm.deployer/META-INF/jbpm-deployers-jboss-beans.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/deployer/config.jboss5/deployers/jbpm.deployer/META-INF/jbpm-deployers-jboss-beans.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/deployer/config.jboss5/deployers/jbpm.deployer/META-INF/jbpm-deployers-jboss-beans.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- + Locate the single instance of the kernel + --> + <bean name="org.jbpm:service=KernelLocator" + class="org.jbpm.integration.util.KernelLocator"> + <property name="kernel"> + <inject bean="jboss.kernel:service=Kernel" /> + </property> + </bean> + + <!-- + Dependency decorator. I.e. Deployment->TransactionManager + --> + <bean name="org.jbpm:service=DependencyDeployer" + class="org.jbpm.integration.jboss5.JBPMDependenciesDeployer"/> + + + <!-- + The JBPM Meta Data Deployer + --> + <bean name="org.jbpm:service=MetaDataDeployer" + class="org.jbpm.integration.jboss5.JBPMMetaDataDeployer"> + + <property name="suffix">.jpdl.xml</property> + + <!-- Move to .par when https://jira.jboss.org/jira/browse/JBAS-6274 is done --> + <property name="jarExtension">jpdl</property> + + <property name="allowMultipleFiles">true</property> + + <!-- files the deployer can process --> + <!--property name="names"> + <set elementClass="java.lang.String"> + <value>process.jpdl.xml</value> + </set> + </property--> + + </bean> + + <!-- + The actual jBPM Deployer + --> + <bean name="org.jbpm:service=Deployer" + class="org.jbpm.integration.jboss5.JBPMDeployer"/> + +</deployment> \ No newline at end of file Property changes on: jbpm4/trunk/modules/distro/src/main/deployer/config.jboss5/deployers/jbpm.deployer/META-INF/jbpm-deployers-jboss-beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -63,13 +63,24 @@ <!-- TARGETS --> <!-- ### MAIN TARGET TO INSTALL JBPM INTO JBOSS ######################### --> <target name="install.jbpm.into.jboss" description="installs jBPM into JBoss"> - <antcall target="install.jbpm.into.jboss.generics" /> + <antcall target="install.jbpm.into.jboss.common" /> <antcall target="install.jbpm.into.jboss.500specifics" /> <antcall target="install.jbpm.into.jboss.db.hsqldb" /> </target> <!-- ### THE JBOSS GENERIC PART ######################################### --> - <target name="install.jbpm.into.jboss.generics"> + <target name="install.jbpm.into.jboss.common"> + <!-- copy static configuration files --> + <copy todir="${jboss.server.config.dir}" overwrite="true"> + <fileset dir="${jbpm.home}/jboss/config.common" /> + </copy> + + <!-- copy the right hibernate configuration file --> + <copy file="${jbpm.home}/jboss/hibernate.cfg/${database}.hibernate.cfg.xml" + tofile="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" + overwrite="true" /> + + <copy todir="${jboss.server.config.dir}/lib" overwrite="true"> <fileset dir="${jbpm.home}"> <include name="jbpm.jar" /> @@ -97,18 +108,6 @@ </fileset> </copy> - <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar/META-INF" overwrite="true"> - <fileset dir="${jbpm.home}/jboss/jbpm-console-config"> - <include name="jboss-service.xml" /> - </fileset> - </copy> - - <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> - <fileset dir="${jbpm.home}/jboss/jbpm-enterprise-config"> - <include name="jbpm-destinations-service.xml"/> - </fileset> - </copy> - <mkdir dir="${jboss.home}/docs/examples/jbpm" /> <copy todir="${jboss.home}/docs/examples/jbpm" overwrite="true"> <fileset dir="${jbpm.home}/jboss/datasources" /> @@ -117,6 +116,11 @@ <!-- ### THE JBOSS 5.0.0.GA SPECIFIC PART ############################### --> <target name="install.jbpm.into.jboss.500specifics" if="jboss.version.500"> + <!-- copy static configuration files --> + <copy todir="${jboss.server.config.dir}" overwrite="true"> + <fileset dir="${jbpm.home}/jboss/config.jboss5" /> + </copy> + <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> <fileset dir="${jbpm.home}/jboss/lib"> <include name="jbpm-jboss5.jar"/> @@ -124,9 +128,6 @@ <fileset dir="${jbpm.home}/lib"> <include name="jbpm-spi.jar"/> </fileset> - <fileset dir="${jbpm.home}/jboss/jbpm-jboss5-config/META-INF"> - <include name="jbpm-service-jboss-beans.xml"/> - </fileset> </copy> </target> Added: jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-destinations-service.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-destinations-service.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-destinations-service.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- $Id: jbossmq-destinations-service.xml 25907 2004-11-16 04:32:39Z ejort $ --> + +<!-- + This file defines the default Queues and Topics that jBPM ships with. + You can add other destinations to this file, or you can create other + *-service.xml files to contain your application's destinations. + --> + +<server> + <!-- + Destinations without a configured SecurityManager or without a + SecurityConf will default to role guest with read=true, write=true, + create=false. + --> + + <mbean code="org.jboss.mq.server.jmx.Queue" + name="jboss.mq.destination:service=Queue,name=JbpmCommandQueue"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + </mbean> + +</server> Property changes on: jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-destinations-service.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/ejb-jar.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/ejb-jar.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/ejb-jar.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,183 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<ejb-jar version="2.1" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee + http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/j2ee"> + + <description>JBoss jBPM enterprise beans</description> + <display-name>JBoss jBPM enterprise beans</display-name> + + <enterprise-beans> + + <session> + <description>Executes commands in a separate context.</description> + <display-name>jBPM Command Executor</display-name> + <ejb-name>CommandExecutor</ejb-name> + <home>org.jbpm.enterprise.internal.ejb.RemoteCommandExecutorHome</home> + <remote>org.jbpm.enterprise.internal.ejb.RemoteCommandExecutor</remote> + <local-home>org.jbpm.enterprise.internal.ejb.LocalCommandExecutorHome</local-home> + <local>org.jbpm.enterprise.internal.ejb.LocalCommandExecutor</local> + <ejb-class>org.jbpm.enterprise.internal.ejb.CommandExecutorSLSB</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + + <ejb-local-ref> + <description> + Link to the local entity bean that implements the timer session. + Required for that contain timers. + </description> + <ejb-ref-name>ejb/LocalTimer</ejb-ref-name> + <ejb-ref-type>Entity</ejb-ref-type> + <local-home>org.jbpm.enterprise.internal.ejb.LocalTimerHome</local-home> + <local>org.jbpm.enterprise.internal.ejb.LocalTimer</local> + <ejb-link>Timer</ejb-link> + </ejb-local-ref> + + <resource-ref> + <description> + Logical name of the data source that provides connections to the database session. + Must match the hibernate.connection.datasource property. + </description> + <res-ref-name>jdbc/JbpmDataSource</res-ref-name> + <res-type>javax.sql.DataSource</res-type> + <res-auth>Container</res-auth> + </resource-ref> + + <resource-ref> + <description> + Logical name of the factory that provides JMS connections to the message session. + Required for processes that contain asynchronous continuations. + </description> + <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> + <res-type>javax.jms.ConnnectionFactory</res-type> + <res-auth>Container</res-auth> + </resource-ref> + + <message-destination-ref> + <description> + The command listener bean receives messages from the queue referenced here. To ensure this + is the same queue to which command messages can be sent, the message-destination-link + element points to a common logical destination, CommandQueue. + </description> + <message-destination-ref-name>jms/CommandQueue</message-destination-ref-name> + <message-destination-type>javax.jms.Queue</message-destination-type> + <message-destination-usage>Produces</message-destination-usage> + <message-destination-link>CommandQueue</message-destination-link> + </message-destination-ref> + </session> + + <message-driven> + <description> + Listens for serialized commands and routes them to the command executor. + </description> + <display-name>jBPM Command Receiver</display-name> + <ejb-name>CommandReceiver</ejb-name> + <ejb-class>org.jbpm.enterprise.internal.ejb.CommandReceiverMDB</ejb-class> + <transaction-type>Container</transaction-type> + <message-destination-type>javax.jms.Queue</message-destination-type> + <message-destination-link>CommandQueue</message-destination-link> + + <ejb-local-ref> + <description> + Link to the local session bean that executes commands on a separate environment. + </description> + <ejb-ref-name>ejb/LocalCommandExecutor</ejb-ref-name> + <ejb-ref-type>Session</ejb-ref-type> + <local-home>org.jbpm.enterprise.internal.ejb.LocalCommandExecutorHome</local-home> + <local>org.jbpm.enterprise.internal.ejb.LocalCommandExecutor</local> + <ejb-link>CommandExecutor</ejb-link> + </ejb-local-ref> + + <resource-ref> + <description> + Logical name of the factory that provides JMS connections for producing result messages. + Required for command messages that indicate a reply destination. + </description> + <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> + <res-type>javax.jms.ConnectionFactory</res-type> + <res-auth>Container</res-auth> + <res-sharing-scope>Shareable</res-sharing-scope> + </resource-ref> + + <message-destination-ref> + <description> + Messages that do not contain a command are sent to the queue referenced here. + If absent, said messages are rejected, which may cause the container to redeliver. + </description> + <message-destination-ref-name>jms/DeadLetterQueue</message-destination-ref-name> + <message-destination-type>javax.jms.Queue</message-destination-type> + <message-destination-usage>Produces</message-destination-usage> + </message-destination-ref> + </message-driven> + + <entity> + <description>Interacts with the EJB timer service to schedule jBPM timers.</description> + <display-name>jBPM Timer</display-name> + <ejb-name>Timer</ejb-name> + <local-home>org.jbpm.enterprise.internal.ejb.LocalTimerHome</local-home> + <local>org.jbpm.enterprise.internal.ejb.LocalTimer</local> + <ejb-class>org.jbpm.enterprise.internal.ejb.TimerEB</ejb-class> + <persistence-type>Container</persistence-type> + <prim-key-class>java.lang.Long</prim-key-class> + <reentrant>false</reentrant> + <cmp-version>2.x</cmp-version> + <abstract-schema-name>pvm</abstract-schema-name> + <cmp-field> + <field-name>dbid</field-name> + </cmp-field> + <cmp-field> + <field-name>dueDate</field-name> + </cmp-field> + <!-- + <cmp-field> + <field-name>dbversion</field-name> + </cmp-field> + --> + <primkey-field>dbid</primkey-field> + + <ejb-local-ref> + <description>Link to the session bean that executes timers on a separate environment.</description> + <ejb-ref-name>ejb/LocalCommandExecutor</ejb-ref-name> + <ejb-ref-type>Session</ejb-ref-type> + <local-home>org.jbpm.enterprise.internal.ejb.LocalCommandExecutorHome</local-home> + <local>org.jbpm.enterprise.internal.ejb.LocalCommandExecutor</local> + <ejb-link>CommandExecutor</ejb-link> + </ejb-local-ref> + </entity> + + </enterprise-beans> + + <assembly-descriptor> + + <container-transaction> + <method> + <ejb-name>CommandExecutor</ejb-name> + <method-name>*</method-name> + </method> + <trans-attribute>Required</trans-attribute> + </container-transaction> + + <container-transaction> + <method> + <ejb-name>CommandReceiver</ejb-name> + <method-name>*</method-name> + </method> + <trans-attribute>Required</trans-attribute> + </container-transaction> + + <container-transaction> + <method> + <ejb-name>Timer</ejb-name> + <method-name>*</method-name> + </method> + <trans-attribute>Required</trans-attribute> + </container-transaction> + + <message-destination> + <message-destination-name>CommandQueue</message-destination-name> + </message-destination> + + </assembly-descriptor> + +</ejb-jar> Property changes on: jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/ejb-jar.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/jboss.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/jboss.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/jboss.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> + +<jboss> + + <enterprise-beans> + + <session> + <ejb-name>CommandExecutor</ejb-name> + <jndi-name>jbpm/CommandExecutor</jndi-name> + <local-jndi-name>java:jbpm/CommandExecutor</local-jndi-name> + <resource-ref> + <res-ref-name>jdbc/JbpmDataSource</res-ref-name> + <jndi-name>java:JbpmDS</jndi-name> + </resource-ref> + <resource-ref> + <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> + <jndi-name>java:JmsXA</jndi-name> + </resource-ref> + </session> + + <message-driven> + <ejb-name>CommandReceiver</ejb-name> + <resource-ref> + <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> + <jndi-name>java:JmsXA</jndi-name> + </resource-ref> + <message-destination-ref> + <message-destination-ref-name>jms/DeadLetterQueue</message-destination-ref-name> + <jndi-name>queue/DLQ</jndi-name> + </message-destination-ref> + </message-driven> + + <entity> + <ejb-name>Timer</ejb-name> + <local-jndi-name>java:jbpm/Timer</local-jndi-name> + </entity> + + </enterprise-beans> + + <assembly-descriptor> + + <message-destination> + <message-destination-name>CommandQueue</message-destination-name> + <jndi-name>queue/JbpmCommandQueue</jndi-name> + </message-destination> + + </assembly-descriptor> + +</jboss> Property changes on: jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/jboss.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/jbosscmp-jdbc.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/jbosscmp-jdbc.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/jbosscmp-jdbc.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,33 @@ +<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_4_0.dtd"> + +<jbosscmp-jdbc> + <defaults> + <datasource>java:/JbpmDS</datasource> + <create-table>false</create-table> + <remove-table>false</remove-table> + <pk-constraint>false</pk-constraint> + </defaults> + <enterprise-beans> + <entity> + <ejb-name>Timer</ejb-name> + <table-name>JBPM_JOB</table-name> + <cmp-field> + <field-name>dbid</field-name> + <column-name>DBID_</column-name> + <auto-increment/> + </cmp-field> + <cmp-field> + <field-name>dueDate</field-name> + <column-name>DUEDATE_</column-name> + </cmp-field> + <!-- + <optimistic-locking> + <version-column /> + <field-name>dbversion</field-name> + <column-name>DBVERSION_</column-name> + </optimistic-locking> + --> + </entity> + </enterprise-beans> +</jbosscmp-jdbc> \ No newline at end of file Property changes on: jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/jbosscmp-jdbc.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/META-INF/jboss-service.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/META-INF/jboss-service.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/META-INF/jboss-service.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<server> + <!-- The custom JAAS login configuration that installs + a Configuration capable of dynamically updating the + config settings + --> + <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" name="org.jbpm:service=LoginConfig"> + <attribute name="PolicyConfig" serialDataType="jbxb"> + <jaas:policy xsi:schemaLocation="urn:jboss:security-config:4.1 resource:security-config_4_1.xsd" xmlns:jaas="urn:jboss:security-config:4.1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <jaas:application-policy name="jbpm-console"> + <jaas:authentication> + <!-- Authenticate against the Identiy database --> + <jaas:login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule" flag="required"> + <jaas:module-option name="dsJndiName">java:/JbpmDS</jaas:module-option> + <jaas:module-option name="principalsQuery"> SELECT PASSWORD_ FROM JBPM_ID_USER WHERE ID_=? </jaas:module-option> + <jaas:module-option name="rolesQuery"> + SELECT g.NAME_ ,'Roles' FROM JBPM_ID_USER u, JBPM_ID_MEMBERSHIP m, JBPM_ID_GROUP g + WHERE g.TYPE_='security-role' AND m.GROUP_ = g.DBID_ AND m.USER_ = u.DBID_ AND u.ID_=? </jaas:module-option> + </jaas:login-module> + </jaas:authentication> + </jaas:application-policy> + </jaas:policy> + </attribute> + <depends optional-attribute-name="LoginConfigService"> jboss.security:service=XMLLoginConfig</depends> + <depends optional-attribute-name="SecurityManagerService"> jboss.security:service=JaasSecurityManager</depends> + </mbean> +</server> Property changes on: jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/META-INF/jboss-service.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.tx.jta.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss4/deploy/jbpm/jbpm-service.sar/jboss-beans.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss4/deploy/jbpm/jbpm-service.sar/jboss-beans.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss4/deploy/jbpm/jbpm-service.sar/jboss-beans.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,30 @@ +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"> + + <!-- + Locate the single instance of the kernel + --> + <bean name="org.jbpm:service=KernelLocator" + class="org.jbpm.integration.util.KernelLocator"> + <property name="kernel"> + <inject bean="jboss.kernel:service=Kernel" /> + </property> + </bean> + + <!-- + JBPMService + --> + <bean name="org.jbpm:service=ProcessEngine" + class="org.jbpm.integration.spi.JBPMService"> + <property name="serverConfig"><inject bean="org.jbpm:service=ServerConfig"/></property> + </bean> + + <!-- + ServerConfig + --> + <bean name="org.jbpm:service=ServerConfig" + class="org.jbpm.integration.jboss4.mgmt.ServerConfig"> + </bean> + +</deployment> \ No newline at end of file Property changes on: jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss4/deploy/jbpm/jbpm-service.sar/jboss-beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deploy/jbpm/jbpm-service.sar/jbpm-service-jboss-beans.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deploy/jbpm/jbpm-service.sar/jbpm-service-jboss-beans.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deploy/jbpm/jbpm-service.sar/jbpm-service-jboss-beans.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- + JBPM Service + --> + <bean name="org.jbpm:service=ProcessEngine" + class="org.jbpm.integration.spi.JBPMService"> + <property name="serverConfig"><inject bean="org.jbpm:service=ServerConfig"/></property> + </bean> + + <!-- + ServerConfig + --> + <bean name="org.jbpm:service=ServerConfig" + class="org.jbpm.integration.jboss5.mgmt.ServerConfig"> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + +</deployment> \ No newline at end of file Property changes on: jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deploy/jbpm/jbpm-service.sar/jbpm-service-jboss-beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.datasource">java:JbpmDS</property> + <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> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property> + <property name="hibernate.connection.datasource">java:JbpmDS</property> + <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> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property> + <property name="hibernate.connection.datasource">java:JbpmDS</property> + <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> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> + <property name="hibernate.connection.datasource">java:JbpmDS</property> + <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> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property> + <property name="hibernate.connection.datasource">java:JbpmDS</property> + <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> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm4/trunk/modules/enterprise/pom.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/enterprise/pom.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -81,13 +81,6 @@ <!-- Plugins --> <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> - <testResources> <testResource> <directory>src/test/resources</directory> @@ -98,16 +91,6 @@ <plugins> <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <excludes> - <exclude>jbpm.cfg.xml</exclude> - <exclude>jbpm-destinations-service.xml</exclude> - </excludes> - </configuration> - </plugin> - - <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> @@ -127,21 +110,6 @@ </configuration> </execution> - <execution> - <id>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> Deleted: jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml =================================================================== --- jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -1,17 +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>config</id> - <formats> - <format>jar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <fileSet> - <directory>${project.build.outputDirectory}</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>jbpm-destinations-service.xml</include> - </includes> - </fileSet> - </fileSets> -</assembly> \ No newline at end of file Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/jta/JtaTransactionInterceptor.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/jta/JtaTransactionInterceptor.java 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/jta/JtaTransactionInterceptor.java 2009-04-27 13:09:07 UTC (rev 4636) @@ -34,6 +34,7 @@ import javax.transaction.SystemException; import javax.transaction.UserTransaction; +import org.hibernate.StaleStateException; import org.jbpm.api.JbpmException; import org.jbpm.api.cmd.Command; import org.jbpm.internal.log.Log; @@ -46,24 +47,25 @@ protected String userTransactionName = "java:comp/UserTransaction"; protected Properties jndiProperties; + int retries = 3; + long delay = 50; + long delayFactor = 4; private UserTransaction userTransaction; private static Log log = Log.getLog(JtaTransactionInterceptor.class.getName()); public <T> T execute(Command<T> command) { - UserTransaction transaction = getUserTransaction(); + UserTransaction userTransaction = getUserTransaction(); try { T result; - if (transaction.getStatus() == Status.STATUS_NO_TRANSACTION) { - result = execute(command, transaction); - } - else { + if (userTransaction.getStatus() == Status.STATUS_NO_TRANSACTION) { + result = executeCmdInNewJtaTx(command, userTransaction); + } else { // transaction already underway, just call next interceptor result = getNext().execute(command); } return result; - } - catch (SystemException e) { + } catch (SystemException e) { throw new JbpmException("transaction manager encountered unexpected error condition", e); } } @@ -74,50 +76,75 @@ Context initialContext = new InitialContext(jndiProperties); userTransaction = (UserTransaction) initialContext.lookup(userTransactionName); initialContext.close(); - } - catch (NamingException e) { + } catch (NamingException e) { throw new JbpmException("failed to retrieve user transaction: " + userTransactionName); } } return userTransaction; } - private <T> T execute(Command<T> command, UserTransaction transaction) - throws SystemException { - try { - transaction.begin(); - T result = getNext().execute(command); - transaction.commit(); - return result; - } - catch (RuntimeException e) { - // attempt rollback + protected <T> T executeCmdInNewJtaTx(Command<T> command, UserTransaction userTransaction) throws SystemException { + + // TODO JBPM-2196 unify the retry code with the RetryInterceptor + + int attempt = 1; + long sleepTime = delay; + + while (attempt<=retries) { + if (attempt>1) { + log.trace("retrying..."); + } try { - transaction.rollback(); + userTransaction.begin(); + T result = getNext().execute(command); + userTransaction.commit(); + return result; + + } catch (StaleStateException e) { + rollback(userTransaction); + attempt++; + log.trace("optimistic locking failed: "+e); + log.trace("waiting "+sleepTime+" millis"); + try { + Thread.sleep(sleepTime); + } catch (InterruptedException e1) { + log.trace("retry sleeping got interrupted"); + } + sleepTime *= delayFactor; + + } catch (RuntimeException e) { + // attempt rollback + rollback(userTransaction); + // rethrow original exception + throw e; + + } catch (NotSupportedException e) { + // thrown by begin() call + // no need to rollback since transaction has not begun + throw new JbpmException("cannot begin transaction at this point", e); + + } catch (RollbackException e) { + // transaction rolled back already, no need to rollback again + throw new JbpmException("transaction has been rolled back", e); + + } catch (HeuristicRollbackException e) { + // transaction rolled back already, no need to rollback again + throw new JbpmException("transaction rolled back by heuristic decision", e); + + } catch (HeuristicMixedException e) { + throw new JbpmException("transaction had mixed outcome, possible data inconsistency", e); } - catch (SystemException se) { - // log this exception at a quiet level, the original exception will be rethrown - log.debug("transaction rollback failed", se); - } - // rethrow original exception - throw e; } - catch (NotSupportedException e) { - // thrown by begin() call - // no need to rollback since transaction has not begun - throw new JbpmException("cannot begin transaction at this point", e); + throw new JbpmException("gave up after "+attempt+" attempts"); + } + + protected void rollback(UserTransaction userTransaction) { + try { + userTransaction.rollback(); + } catch (SystemException se) { + // log this exception at a quiet level, the original exception will be + // rethrown + log.debug("transaction rollback failed", se); } - catch (RollbackException e) { - // transaction rolled back already, no need to rollback again - throw new JbpmException("transaction has been rolled back", e); - } - catch (HeuristicRollbackException e) { - // transaction rolled back already, no need to rollback again - throw new JbpmException("transaction rolled back by heuristic decision", e); - } - catch (HeuristicMixedException e) { - throw new JbpmException("transaction had mixed outcome, possible data inconsistency", e); - } } - } Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/JtaTransactionInterceptorBinding.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/JtaTransactionInterceptorBinding.java 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/JtaTransactionInterceptorBinding.java 2009-04-27 13:09:07 UTC (rev 4636) @@ -25,7 +25,7 @@ import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.binding.PropertiesBinding; -import org.jbpm.pvm.internal.wire.binding.WireDescriptorBinding; +import org.jbpm.pvm.internal.wire.binding.WireInterceptorBinding; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor; import org.jbpm.pvm.internal.xml.Parse; @@ -38,7 +38,7 @@ * * @author Alejandro Guizar */ -public class JtaTransactionInterceptorBinding extends WireDescriptorBinding { +public class JtaTransactionInterceptorBinding extends WireInterceptorBinding { private static final PropertiesBinding propertiesBinding = new PropertiesBinding(); Deleted: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-destinations-service.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-destinations-service.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-destinations-service.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- $Id: jbossmq-destinations-service.xml 25907 2004-11-16 04:32:39Z ejort $ --> - -<!-- - This file defines the default Queues and Topics that jBPM ships with. - You can add other destinations to this file, or you can create other - *-service.xml files to contain your application's destinations. - --> - -<server> - <!-- - Destinations without a configured SecurityManager or without a - SecurityConf will default to role guest with read=true, write=true, - create=false. - --> - - <mbean code="org.jboss.mq.server.jmx.Queue" - name="jboss.mq.destination:service=Queue,name=JbpmCommandQueue"> - <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> - </mbean> - -</server> Deleted: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - jBPM4 enterprise configuration. - Uses different command service and environment config. - (i.e. skips the TX interceptor) ---> - -<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - - <process-engine-context> - - <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 /> - - <ejb-local-command-service> - <home jndi-name="java:jbpm/CommandExecutor"/> - </ejb-local-command-service> - - <hibernate-configuration resource="hibernate.cfg.xml"/> - - <hibernate-session-factory /> - - <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-context> - - <transaction-context> - <hibernate-session current="true" /> - <pvm-db-session /> - <job-db-session /> - <ejb-timer-session /> - </transaction-context> - -</jbpm-configuration> Deleted: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.enterprise.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.enterprise.wire.bindings.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.enterprise.wire.bindings.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -1,7 +0,0 @@ -<wire-bindings> - - <binding class="org.jbpm.enterprise.internal.wire.binding.EjbTimerSessionBinding" /> - <binding class="org.jbpm.enterprise.internal.wire.binding.EjbLocalCommandServiceBinding" /> - <binding class="org.jbpm.enterprise.internal.wire.binding.JtaTransactionInterceptorBinding" /> - -</wire-bindings> Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -3,7 +3,8 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> <import resource="jbpm.default.cfg.xml" /> - <import resource="jbpm.deployermgr.cfg.xml" /> + <import resource="jbpm.tx.hibernate.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> </jbpm-configuration> Modified: jbpm4/trunk/modules/integration/console/pom.xml =================================================================== --- jbpm4/trunk/modules/integration/console/pom.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/integration/console/pom.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -47,36 +47,4 @@ </dependency> </dependencies> - <build> - <plugins> - <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> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <excludes> - <exclude>jbpm-users.properties</exclude> - <exclude>jbpm-roles.properties</exclude> - <exclude>jboss-service.xml</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> </project> Deleted: jbpm4/trunk/modules/integration/console/scripts/assembly-config.xml =================================================================== --- jbpm4/trunk/modules/integration/console/scripts/assembly-config.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/integration/console/scripts/assembly-config.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -1,19 +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>config</id> - <formats> - <format>jar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <fileSet> - <directory>${project.build.outputDirectory}</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>jbpm-users.properties</include> - <include>jbpm-roles.properties</include> - <include>jboss-service.xml</include> - </includes> - </fileSet> - </fileSets> -</assembly> \ No newline at end of file Deleted: jbpm4/trunk/modules/integration/console/src/main/resources/jboss-service.xml =================================================================== --- jbpm4/trunk/modules/integration/console/src/main/resources/jboss-service.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/integration/console/src/main/resources/jboss-service.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<server> - <!-- The custom JAAS login configuration that installs - a Configuration capable of dynamically updating the - config settings - --> - <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" name="org.jbpm:service=LoginConfig"> - <attribute name="PolicyConfig" serialDataType="jbxb"> - <jaas:policy xsi:schemaLocation="urn:jboss:security-config:4.1 resource:security-config_4_1.xsd" xmlns:jaas="urn:jboss:security-config:4.1" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <jaas:application-policy name="jbpm-console"> - <jaas:authentication> - <!-- Authenticate against the Identiy database --> - <jaas:login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule" flag="required"> - <jaas:module-option name="dsJndiName">java:/JbpmDS</jaas:module-option> - <jaas:module-option name="principalsQuery"> SELECT PASSWORD_ FROM JBPM_ID_USER WHERE ID_=? </jaas:module-option> - <jaas:module-option name="rolesQuery"> - SELECT g.NAME_ ,'Roles' FROM JBPM_ID_USER u, JBPM_ID_MEMBERSHIP m, JBPM_ID_GROUP g - WHERE g.TYPE_='security-role' AND m.GROUP_ = g.DBID_ AND m.USER_ = u.DBID_ AND u.ID_=? </jaas:module-option> - </jaas:login-module> - </jaas:authentication> - </jaas:application-policy> - </jaas:policy> - </attribute> - <depends optional-attribute-name="LoginConfigService"> jboss.security:service=XMLLoginConfig</depends> - <depends optional-attribute-name="SecurityManagerService"> jboss.security:service=JaasSecurityManager</depends> - </mbean> -</server> Modified: jbpm4/trunk/modules/integration/jboss4/pom.xml =================================================================== --- jbpm4/trunk/modules/integration/jboss4/pom.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/integration/jboss4/pom.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -33,37 +33,4 @@ </dependency> </dependencies> - <!-- Build --> - <build> - <plugins> - <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> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/jbpm.beans/*</exclude> - <exclude>**/jbpm.deployer/*</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </project> Deleted: jbpm4/trunk/modules/integration/jboss4/scripts/assembly-config.xml =================================================================== --- jbpm4/trunk/modules/integration/jboss4/scripts/assembly-config.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/integration/jboss4/scripts/assembly-config.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -1,18 +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>config</id> - <formats> - <format>jar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <fileSet> - <directory>${project.build.outputDirectory}</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>**/jboss-service.xml</include> - <include>**/jboss-beans.xml</include> - </includes> - </fileSet> - </fileSets> -</assembly> \ No newline at end of file Modified: jbpm4/trunk/modules/integration/jboss5/pom.xml =================================================================== --- jbpm4/trunk/modules/integration/jboss5/pom.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/integration/jboss5/pom.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -33,39 +33,4 @@ </dependency> </dependencies> - <!-- Build --> - <build> - <plugins> - <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> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <excludes> - <exclude>META-INF/jbpm-service-jboss-beans.xml</exclude> - <exclude>META-INF/jbpm-deployers-jboss-beans.xml</exclude> - <exclude>META-INF/jbpm.deployer.cfg.xml</exclude> - <exclude>deployers.xml</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </project> Deleted: jbpm4/trunk/modules/integration/jboss5/scripts/assembly-config.xml =================================================================== --- jbpm4/trunk/modules/integration/jboss5/scripts/assembly-config.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/integration/jboss5/scripts/assembly-config.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -1,19 +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>config</id> - <formats> - <format>jar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <fileSet> - <directory>${project.build.outputDirectory}</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>**/*beans.xml</include> - <include>**/jbpm.deployer.cfg.xml</include> - <include>deployers.xml</include> - </includes> - </fileSet> - </fileSets> -</assembly> \ No newline at end of file Deleted: jbpm4/trunk/modules/integration/jboss5/src/main/resources/deployers.xml =================================================================== --- jbpm4/trunk/modules/integration/jboss5/src/main/resources/deployers.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/integration/jboss5/src/main/resources/deployers.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -1,237 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - The base deployers ---> -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - - <classloader><inject bean="deployers-classloader:0.0.0"/></classloader> - - <classloader name="deployers-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"> - <root>${jboss.lib.url}jboss-deployers-core-spi.jar</root> - <root>${jboss.lib.url}jboss-deployers-core.jar</root> - <root>${jboss.lib.url}jboss-deployers-client-spi.jar</root> - <root>${jboss.lib.url}jboss-deployers-client.jar</root> - <root>${jboss.lib.url}jboss-deployers-structure-spi.jar</root> - <root>${jboss.lib.url}jboss-deployers-spi.jar</root> - <root>${jboss.lib.url}jboss-deployers-impl.jar</root> - <root>${jboss.lib.url}jboss-deployers-vfs-spi.jar</root> - <root>${jboss.lib.url}jboss-deployers-vfs.jar</root> - - <!-- JAXB impl here, api is in endorsed --> - <root>${jboss.lib.url}jaxb-impl.jar</root> - <!-- STAX2 impl here, api is in endorsed --> - <root>${jboss.lib.url}wstx.jar</root> - </classloader> - - <!-- use legacy ordering --> - <bean name="topContextComparator"> - <constructor factoryClass="org.jboss.system.deployers.LegacyDeploymentContextComparator" factoryMethod="getInstance"/> - </bean> - - <!-- The ManagedObjectFactory --> - <bean name="ManagedObjectFactory"> - <constructor factoryClass="org.jboss.managed.api.factory.ManagedObjectFactory" factoryMethod="getInstance"/> - <!-- Accept any implementor of InstanceClassFactory --> - <incallback method="addInstanceClassFactory"/> - <uncallback method="removeInstanceClassFactory"/> - <!-- Accept any ManagedObjectDefinition --> - <incallback method="addManagedObjectDefinition"/> - <uncallback method="removeManagedObjectDefinition"/> - </bean> - <!-- The ManagedObjectCreator implementation --> - <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator"> - <property name="mof"><inject bean="ManagedObjectFactory"/></property> - </bean> - - <!-- The MainDeployer --> - <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl"> - <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property> - <property name="deployers"><inject bean="Deployers"/></property> - <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property> - <property name="comparator"><inject bean="topContextComparator"/></property> - </bean> - - <!-- The ManagedDeploymentCreator implementation that supports mapping - attachment types to ManagedDeployment#getTypes - --> - <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.TypedManagedDeploymentCreator" /> - - <!-- The holder for deployers that determine structure --> - <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl"> - <property name="structureBuilder"> - <!-- The consolidator of the structure information --> - <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/> - </property> - <!-- Accept any implementor of structure deployer --> - <incallback method="addDeployer"/> - <uncallback method="removeDeployer"/> - </bean> - - <!-- The holder for deployers that do real deployment --> - <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl"> - <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.deployment:service=DeployersImpl", exposedInterface=org.jboss.deployers.plugins.deployers.DeployersImplMBean.class, registerDirectly=true)</annotation> - <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor> - <!-- Accept any implementor of deployer --> - <incallback method="addDeployer"/> - <uncallback method="removeDeployer"/> - <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property> - </bean> - - <!-- A declared structure descriptor deployer --> - <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/> - - <!-- JAR Structure --> - <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure"> - <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar, .war, .sar, .har, .aop --> - <constructor> - <parameter> - <set elementClass="java.lang.String"> - <value>.zip</value> - <value>.ear</value> - <value>.jar</value> - <value>.rar</value> - <value>.war</value> - <value>.sar</value> - <value>.har</value> - <value>.aop</value> - <value>.deployer</value> - <value>.beans</value> - - <!-- FIXME remove this once JBAS-6274 is done --> - <value>.spring</value> - <value>.rails</value> - <value>.esb</value> - <value>.jpdl</value> - </set> - </parameter> - </constructor> - <property name="candidateStructureVisitorFactory"> - <!-- Any file that is not an ordinary directory is a candidate --> - <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory"> - <!-- A filter to exclude some obvious non-subdeployments --> - <property name="filter"> - <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter"> - <constructor><parameter> - <list elementClass="java.lang.String"> - <!-- Exclude class files as subdeployments --> - <value>.class</value> - </list> - </parameter></constructor> - </bean> - </property> - </bean> - </property> - </bean> - - <!-- File Structure --> - <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure"> - <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml --> - <constructor> - <parameter> - <set elementClass="java.lang.String"> - <value>-service.xml</value> - <value>-beans.xml</value> - <value>-ds.xml</value> - <value>-aop.xml</value> - </set> - </parameter> - </constructor> - </bean> - - <!-- Old AOP deployment - <bean name="AspectAppParsingDeployer" class="org.jboss.aop.asintegration.jboss5.AspectAppParsingDeployer"/> - <bean name="AspectDeployer" class="org.jboss.aop.asintegration.jboss5.AspectDeployer"> - <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property> - </bean> - --> - - <bean name="AOPXMLMetaDataParserDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer"> - <constructor> - <parameter>org.jboss.aop.microcontainer.beans.metadata.AOPDeployment</parameter> - </constructor> - <property name="suffix">-aop.xml</property> - </bean> - <bean name="AOPAnnotationMetaDataParserDeployer" class="org.jboss.aop.asintegration.jboss5.AOPAnnotationMetaDataParserDeployer"> - <constructor> - <parameter><inject bean="AOPXMLMetaDataParserDeployer" property="relativeOrder"/></parameter> - </constructor> - </bean> - <bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer"> - <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property> - </bean> - <bean name="AOPDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.AOPDeploymentAopMetaDataDeployer"> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> - <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property> - </bean> - <bean name="BeansDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.BeansDeploymentAopMetaDataDeployer"> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> - <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property> - </bean> - - <!-- POJO Deployment --> - <bean name="BeanMetaDataICF" class="org.jboss.deployers.plugins.managed.BeanMetaDataICF"> - <property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property> - </bean> - <bean name="KernelDeploymentManagedObjectCreator" class="org.jboss.deployers.plugins.managed.KernelDeploymentManagedObjectCreator"> - <constructor><parameter><inject bean="ManagedObjectFactory"/></parameter></constructor> - </bean> - <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer"> - <property name="suffix">jboss-beans.xml</property> - </bean> - <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"> - <install bean="ManagedDeploymentCreator" method="addAttachmentType"> - <parameter> - <value>org.jboss.kernel.spi.deployment.KernelDeployment</value> - </parameter> - <parameter> - <value>beans</value> - </parameter> - </install> - <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType"> - <parameter> - <value>org.jboss.kernel.spi.deployment.KernelDeployment</value> - </parameter> - </uninstall> - <property name="mgtObjectCreator"><inject bean="KernelDeploymentManagedObjectCreator"/></property> - </bean> - <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer"> - <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor> - </bean> - - <!-- JMX Deployment --> - <bean name="ServiceMetaDataICF" class="org.jboss.system.deployers.managed.ServiceMetaDataICF"> - <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> - </bean> - <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer"> - </bean> - <bean name="ServiceClassLoaderDeployer" class="org.jboss.system.deployers.ServiceClassLoaderDeployer"/> - <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer"> - </bean> - <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer"> - <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor> - </bean> - - <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer"> - <constructor> - <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter> - </constructor> - <property name="name">jboss-classloading.xml</property> - <property name="buildManagedObject">true</property> - </bean> - <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer"> - <property name="defaultMetaData"> - <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/> - </property> - </bean> - <bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/> - <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/> - <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer"> - <property name="classLoading"><inject bean="ClassLoading"/></property> - </bean> - <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer"> - <property name="classLoading"><inject bean="ClassLoading"/></property> - <property name="system"><inject bean="ClassLoaderSystem"/></property> - </bean> - -</deployment> Modified: jbpm4/trunk/modules/integration/spi/pom.xml =================================================================== --- jbpm4/trunk/modules/integration/spi/pom.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/integration/spi/pom.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -32,36 +32,4 @@ </dependency> </dependencies> - <!-- Build --> - <build> - <plugins> - <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> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <excludes> - <exclude>jbpm.cfg.xml</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </project> Deleted: jbpm4/trunk/modules/integration/spi/scripts/assembly-config.xml =================================================================== --- jbpm4/trunk/modules/integration/spi/scripts/assembly-config.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/integration/spi/scripts/assembly-config.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -1,17 +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>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> - </includes> - </fileSet> - </fileSets> -</assembly> \ No newline at end of file Deleted: jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm.cfg.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - jBPM4 configuration used within the AS. - Uses different command service and environment config. - - Resides with 'modules/integration/spi' ---> - -<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - - <process-engine-context> - - <deployer-manager> - <assign-file-type> - <file extension=".jpdl.xml" type="jpdl" /> - </assign-file-type> - <parse-jpdl /> - <check-process /> - <check-problems /> - <save policy="org.jbpm.pvm.internal.wire.binding.VersionTimestampPolicy"/> - </deployer-manager> - - <process-service /> - <execution-service /> - <management-service /> - - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <!-- TODO: JBPM-2101 TX interceptor with 'required' semantics --> - </command-service> - - <hibernate-configuration resource="hibernate.cfg.xml"/> - - <hibernate-session-factory /> - - <job-executor auto-start="true" /> - - <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-context> - - <transaction-context> - <hibernate-session current="true"/> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - </transaction-context> - -</jbpm-configuration> Deleted: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - - <process-engine-context> - - <deployer-manager> - <jpdl-deployer /> - </deployer-manager> - - </process-engine-context> - -</jbpm-configuration> Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.cfg.xml (from rev 4626, jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.cfg.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + + <deployer-manager> + <jpdl-deployer /> + </deployer-manager> + + </process-engine-context> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -3,7 +3,8 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> <import resource="jbpm.default.cfg.xml" /> - <import resource="jbpm.deployermgr.cfg.xml" /> + <import resource="jbpm.tx.hibernate.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> </jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2009-04-27 13:09:07 UTC (rev 4636) @@ -41,6 +41,9 @@ long delayFactor = 4; public <T> T execute(Command<T> command) { + + // TODO JBPM-2196 unify the retry code with the JtaTransactionInterceptor + int attempt = 1; long sleepTime = delay; while (attempt<=retries) { Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -11,12 +11,6 @@ <management-service /> <task-service /> - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - <hibernate-configuration> <cfg resource="jbpm.hibernate.cfg.xml" /> </hibernate-configuration> @@ -54,8 +48,6 @@ <message-session /> <timer-session /> <history-session /> - <transaction /> - <hibernate-session /> </transaction-context> </jbpm-configuration> Added: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.tx.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.tx.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.tx.hibernate.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + <command-service> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> + </process-engine-context> + + <transaction-context> + <transaction /> + <hibernate-session /> + </transaction-context> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.tx.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.tx.jta.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.tx.jta.cfg.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.tx.jta.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + <command-service> + <retry-interceptor /> + <environment-interceptor /> + <jta-transaction-interceptor /> + </command-service> + </process-engine-context> + + <transaction-context> + <transaction /> + <hibernate-session current="true" /> + </transaction-context> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.tx.jta.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.wire.bindings.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.wire.bindings.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -93,6 +93,7 @@ <binding class="org.jbpm.enterprise.internal.wire.binding.EjbTimerSessionBinding" /> <binding class="org.jbpm.enterprise.internal.wire.binding.EjbLocalCommandServiceBinding" /> <binding class="org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding" /> + <binding class="org.jbpm.enterprise.internal.wire.binding.JtaTransactionInterceptorBinding" /> <!-- jpdl bindings --> <binding class="org.jbpm.jpdl.internal.xml.JpdlDeployerBinding" /> Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -3,5 +3,6 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.tx.hibernate.cfg.xml" /> </jbpm-configuration> Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -3,7 +3,8 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> <import resource="jbpm.default.cfg.xml" /> - <import resource="jbpm.deployermgr.cfg.xml" /> + <import resource="jbpm.tx.hibernate.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> </jbpm-configuration> Modified: jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -2,59 +2,9 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine-context> - - <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 /> - - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration resource="hibernate.cfg.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 /> + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.tx.hibernate.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> - <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-context> - - <transaction-context> - <hibernate-session /> - <transaction /> - <pvm-db-session /> - <job-db-session /> - <message-session /> - <timer-session /> - </transaction-context> - </jbpm-configuration> Added: jbpm4/trunk/modules/test-load/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-load/src/test/resources/jbpm.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/test-load/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + <mapping resource="jbpm.load.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/test-load/src/test/resources/jbpm.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2009-04-27 13:07:32 UTC (rev 4635) +++ jbpm4/trunk/qa/build.xml 2009-04-27 13:09:07 UTC (rev 4636) @@ -66,12 +66,11 @@ <target name="reinstall.jbpm" depends="delete.jbpm.installation, install.jbpm" /> <target name="integration.testrun.setup"> - <ant antfile="${jbpm.home}/jboss/build.xml" target="stop.jboss" /> <antcall target="reinstall.jbpm" /> <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" /> <ant antfile="${jbpm.home}/jboss/build.xml" target="install.jbpm.into.jboss" /> <ant antfile="${jbpm.home}/jboss/build.xml" target="start.jboss" /> - <copy file="qa/db/${database}.properties" tofile="${jbpm.home}/db/jdbc.properties" overwrite="true" /> + <copy file="db/${database}.properties" tofile="${jbpm.home}/db/jdbc.properties" overwrite="true" /> <ant antfile="${jbpm.home}/db/build.xml" target="create.jbpm.schema" inheritall="false" /> </target>