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

Author: heiko.braun(a)jboss.com Date: 2009-03-11 08:07:28 -0400 (Wed, 11 Mar 2009) New Revision: 4227 Added: jbpm4/trunk/modules/integration/spi/scripts/ jbpm4/trunk/modules/integration/spi/scripts/assembly-config.xml jbpm4/trunk/modules/integration/spi/src/main/resources/jboss-service.xml jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-roles.properties jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-users.properties jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm.cfg.xml Removed: jbpm4/trunk/modules/enterprise/src/main/resources/jboss-service.xml jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-roles.properties jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-users.properties jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml Modified: jbpm4/trunk/modules/distro/pom.xml jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/trunk/modules/enterprise/pom.xml jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml jbpm4/trunk/modules/integration/spi/pom.xml jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java Log: Move jbpm.cfg.xml for AS integration to 'modules/integration/spi' and thus remove the dependency on the enterprise module. Modified: jbpm4/trunk/modules/distro/pom.xml =================================================================== --- jbpm4/trunk/modules/distro/pom.xml 2009-03-11 11:37:42 UTC (rev 4226) +++ jbpm4/trunk/modules/distro/pom.xml 2009-03-11 12:07:28 UTC (rev 4227) @@ -96,6 +96,12 @@ </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-jboss5</artifactId> <version>${version}</version> </dependency> Modified: jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-03-11 11:37:42 UTC (rev 4226) +++ jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-03-11 12:07:28 UTC (rev 4227) @@ -56,6 +56,14 @@ </includes> <unpack>true</unpack> </dependencySet> + <dependencySet> + <outputDirectory>resources/jbpm-spi-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-spi:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> <dependencySet> <outputDirectory>resources/jbpm-jboss5-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-11 11:37:42 UTC (rev 4226) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-11 12:07:28 UTC (rev 4227) @@ -154,27 +154,17 @@ <pack name="Install jBPM in JBoss" required="no" preselected="yes"> <description>The Install jBPM in JBoss</description> - - <!-- jbpm/jbpm-service.sar - <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> - <include name="logging.properties"/> - </fileset> - --> - - <!-- jbpm/jbpm-service.sar , enterprise config--> - <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-enterprise-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> + + <!-- jbpm/jbpm-service.sar , spi config--> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-spi-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> <include name="jbpm.cfg.xml"/> <include name="jbpm-users.properties"/> <include name="jbpm-roles.properties"/> </fileset> - <!-- jbpm/jbpm-service.sar/META-INF , enterprise config--> - <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-enterprise-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/META-INF" override="true"> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-spi-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/META-INF" override="true"> <include name="jboss-service.xml"/> </fileset> - - <!--fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-integration-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> - <include name="bpm-process-deployer.xml" /> - </fileset--> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> <include name="jbpm-pvm.jar" /> <include name="jbpm-jpdl.jar" /> @@ -183,14 +173,9 @@ <!-- jbpm/jbpm-enterprise.jar --> <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-enterprise.jar&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar" - unpack="true" override="true" /> + unpack="true" override="true" /> - - <!-- jbpm/jbpm-userguide.war --> - <!--file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war" - unpack="true" override="true" /--> - - <!-- jbpm-destinations-service.xml --> + <!-- enterprise config, jbpm-destinations-service.xml --> <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-enterprise-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/" override="true"> <include name="jbpm-destinations-service.xml"/> </fileset> Modified: jbpm4/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm4/trunk/modules/enterprise/pom.xml 2009-03-11 11:37:42 UTC (rev 4226) +++ jbpm4/trunk/modules/enterprise/pom.xml 2009-03-11 12:07:28 UTC (rev 4227) @@ -81,12 +81,8 @@ <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> - <excludes> - <exclude>jbpm.cfg.xml</exclude> - <exclude>jbpm-destinations-service.xml</exclude> - <exclude>jbpm-users.properties</exclude> - <exclude>jbpm-roles.properties</exclude> - <exclude>jboss-service.xml</exclude> + <excludes> + <exclude>jbpm-destinations-service.xml</exclude> </excludes> </configuration> </plugin> Modified: jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml =================================================================== --- jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml 2009-03-11 11:37:42 UTC (rev 4226) +++ jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml 2009-03-11 12:07:28 UTC (rev 4227) @@ -9,12 +9,8 @@ <fileSet> <directory>${project.build.outputDirectory}</directory> <outputDirectory>/</outputDirectory> - <includes> - <include>jbpm.cfg.xml</include> + <includes> <include>jbpm-destinations-service.xml</include> - <include>jbpm-users.properties</include> - <include>jbpm-roles.properties</include> - <include>jboss-service.xml</include> </includes> </fileSet> </fileSets> Deleted: jbpm4/trunk/modules/enterprise/src/main/resources/jboss-service.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/jboss-service.xml 2009-03-11 11:37:42 UTC (rev 4226) +++ jbpm4/trunk/modules/enterprise/src/main/resources/jboss-service.xml 2009-03-11 12:07:28 UTC (rev 4227) @@ -1,37 +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.jboss.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> - - <!-- Simple authentication --> - <jaas:login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" - flag="required"> - <jaas:module-option name="usersProperties">jbpm-users.properties</jaas:module-option> - <jaas:module-option name="rolesProperties">jbpm-roles.properties</jaas:module-option> - </jaas:login-module> - - - <!-- Authenticate against the IDM 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 NAME_=? </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.ID_ AND m.USER_ = u.ID_ AND u.NAME_=? </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> Deleted: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-roles.properties =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-roles.properties 2009-03-11 11:37:42 UTC (rev 4226) +++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-roles.properties 2009-03-11 12:07:28 UTC (rev 4227) @@ -1 +0,0 @@ -admin=admin \ No newline at end of file Deleted: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-users.properties =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-users.properties 2009-03-11 11:37:42 UTC (rev 4226) +++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-users.properties 2009-03-11 12:07:28 UTC (rev 4227) @@ -1 +0,0 @@ -admin=admin \ No newline at end of file Deleted: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2009-03-11 11:37:42 UTC (rev 4226) +++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2009-03-11 12:07:28 UTC (rev 4227) @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - jBPM4 configuration used within the AS. - Uses different command service and environment config. ---> - -<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> Modified: jbpm4/trunk/modules/integration/spi/pom.xml =================================================================== --- jbpm4/trunk/modules/integration/spi/pom.xml 2009-03-11 11:37:42 UTC (rev 4226) +++ jbpm4/trunk/modules/integration/spi/pom.xml 2009-03-11 12:07:28 UTC (rev 4227) @@ -35,7 +35,7 @@ <!-- Build --> <build> <plugins> - <!--plugin> + <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> @@ -52,12 +52,15 @@ </configuration> </execution> </executions> - </plugin--> + </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <excludes> - <exclude>*beans.xml</exclude> + <exclude>jbpm.cfg.xml</exclude> + <exclude>jbpm-users.properties</exclude> + <exclude>jbpm-roles.properties</exclude> + <exclude>jboss-service.xml</exclude> </excludes> </configuration> </plugin> Added: jbpm4/trunk/modules/integration/spi/scripts/assembly-config.xml =================================================================== --- jbpm4/trunk/modules/integration/spi/scripts/assembly-config.xml (rev 0) +++ jbpm4/trunk/modules/integration/spi/scripts/assembly-config.xml 2009-03-11 12:07:28 UTC (rev 4227) @@ -0,0 +1,20 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>config</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>jbpm.cfg.xml</include> + <include>jbpm-users.properties</include> + <include>jbpm-roles.properties</include> + <include>jboss-service.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java =================================================================== --- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java 2009-03-11 11:37:42 UTC (rev 4226) +++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java 2009-03-11 12:07:28 UTC (rev 4227) @@ -124,14 +124,16 @@ File deploymentArtifact = new File(ref.getLocation()); if(!deploymentArtifact.exists()) { - log.info("The deployment artifact for process '"+ref+" has been removed."+ - " The process will be deleted"); + log.info("The deployment artifact for process '"+ref+" has been deleted."+ + " The process definition will be removed."); processService.deleteProcessDefinition(ref.getProcessId()); } else { - // TODO: if the file reamains, mark the process as 'shutdown' + // TODO: if the file remains, mark the process as 'shutdown' + log.info("The deployment artifact for process '"+ref+"' retains. " + + "Keep process definition."); } } Copied: jbpm4/trunk/modules/integration/spi/src/main/resources/jboss-service.xml (from rev 4225, jbpm4/trunk/modules/enterprise/src/main/resources/jboss-service.xml) =================================================================== --- jbpm4/trunk/modules/integration/spi/src/main/resources/jboss-service.xml (rev 0) +++ jbpm4/trunk/modules/integration/spi/src/main/resources/jboss-service.xml 2009-03-11 12:07:28 UTC (rev 4227) @@ -0,0 +1,37 @@ +<?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.jboss.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> + + <!-- Simple authentication --> + <jaas:login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" + flag="required"> + <jaas:module-option name="usersProperties">jbpm-users.properties</jaas:module-option> + <jaas:module-option name="rolesProperties">jbpm-roles.properties</jaas:module-option> + </jaas:login-module> + + + <!-- Authenticate against the IDM 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 NAME_=? </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.ID_ AND m.USER_ = u.ID_ AND u.NAME_=? </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> Copied: jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-roles.properties (from rev 4225, jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-roles.properties) =================================================================== --- jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-roles.properties (rev 0) +++ jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-roles.properties 2009-03-11 12:07:28 UTC (rev 4227) @@ -0,0 +1 @@ +admin=admin \ No newline at end of file Copied: jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-users.properties (from rev 4225, jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-users.properties) =================================================================== --- jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-users.properties (rev 0) +++ jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm-users.properties 2009-03-11 12:07:28 UTC (rev 4227) @@ -0,0 +1 @@ +admin=admin \ No newline at end of file Added: jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/integration/spi/src/main/resources/jbpm.cfg.xml 2009-03-11 12:07:28 UTC (rev 4227) @@ -0,0 +1,63 @@ +<?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>