[jbpm-commits] JBoss JBPM SVN: r1746 - in jbossbpm/impl/jbpm3/trunk/modules: console/scripts and 5 other directories.

Author: heiko.braun(a)jboss.com Date: 2008-07-29 07:13:37 -0400 (Tue, 29 Jul 2008) New Revision: 1746 Added: jbossbpm/impl/jbpm3/trunk/modules/console/scripts/ jbossbpm/impl/jbpm3/trunk/modules/console/scripts/assembly-config.xml jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/login/ jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/login/jboss-service.xml jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-roles.properties jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-users.properties Removed: jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/jbpm.mail.templates.xml Modified: jbossbpm/impl/jbpm3/trunk/modules/console/pom.xml jbossbpm/impl/jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml jbossbpm/impl/jbpm3/trunk/modules/distribution/pom.xml jbossbpm/impl/jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml jbossbpm/impl/jbpm3/trunk/modules/distribution/scripts/install-definition.xml Log: JBPM-1415: Unify login configuration across jBPM modules Modified: jbossbpm/impl/jbpm3/trunk/modules/console/pom.xml =================================================================== --- jbossbpm/impl/jbpm3/trunk/modules/console/pom.xml 2008-07-29 09:49:33 UTC (rev 1745) +++ jbossbpm/impl/jbpm3/trunk/modules/console/pom.xml 2008-07-29 11:13:37 UTC (rev 1746) @@ -12,62 +12,85 @@ <!-- $Id$ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <name>JBoss jBPM - Console</name> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-console</artifactId> - <packaging>war</packaging> + <name>JBoss jBPM - Console</name> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-console</artifactId> + <packaging>war</packaging> - <!-- Parent --> - <parent> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm</artifactId> - <version>3.3.0-SNAPSHOT</version> - </parent> - - <!-- Dependencies --> - <dependencies> - <!-- - The exclusions below are defined such that the war is in sync with - the one produced by 3.2.3.GA - --> - <!-- jBPM Dependencies --> - <dependency> + <!-- Parent --> + <parent> <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-jpdl-identity</artifactId> - <version>${version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-jbpm4jsf</artifactId> - <version>${version}</version> - <scope>provided</scope> - </dependency> + <artifactId>jbpm</artifactId> + <version>3.3.0-SNAPSHOT</version> + </parent> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.gravel</groupId> - <artifactId>gravel</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> + <!-- Dependencies --> + <dependencies> + <!-- + The exclusions below are defined such that the war is in sync with + the one produced by 3.2.3.GA + --> + <!-- jBPM Dependencies --> + <dependency> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-jpdl-identity</artifactId> + <version>${version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-jbpm4jsf</artifactId> + <version>${version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.gravel</groupId> + <artifactId>gravel</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <!-- Plugins --> + <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> + </plugins> + </build> </project> \ No newline at end of file Added: jbossbpm/impl/jbpm3/trunk/modules/console/scripts/assembly-config.xml =================================================================== --- jbossbpm/impl/jbpm3/trunk/modules/console/scripts/assembly-config.xml (rev 0) +++ jbossbpm/impl/jbpm3/trunk/modules/console/scripts/assembly-config.xml 2008-07-29 11:13:37 UTC (rev 1746) @@ -0,0 +1,26 @@ +<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>login</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/main/resources/login</directory> + <outputDirectory>/META-INF</outputDirectory> + <includes> + <include>jboss-service.xml</include> + <include>jbpm-console-users.properties</include> + <include>jbpm-console-roles.properties</include> + </includes> + </fileSet> + <fileSet> + <directory>src/test/resources</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>log4j.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: jbossbpm/impl/jbpm3/trunk/modules/console/scripts/assembly-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/jbpm.mail.templates.xml =================================================================== --- jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/jbpm.mail.templates.xml 2008-07-29 09:49:33 UTC (rev 1745) +++ jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/jbpm.mail.templates.xml 2008-07-29 11:13:37 UTC (rev 1746) @@ -1,24 +0,0 @@ -<mail-templates> - - <variable name="BaseTaskListURL" value="http://localhost:8080/jbpm/home?taskId=" /> - - <mail-template name='task-assign'> - <actors>#{taskInstance.actorId}</actors> - <subject>Task '#{taskInstance.name}'</subject> - <text><![CDATA[Hi, -Task '#{taskInstance.name}' has been assigned to you. -Go for it: #{BaseTaskListURL}#{taskInstance.id} -Thanks. ----powered by JBoss jBPM---]]></text> - </mail-template> - - <mail-template name='task-reminder'> - <actors>#{taskInstance.actorId}</actors> - <subject>Task '#{taskInstance.name}' !</subject> - <text><![CDATA[Hey, -Don't forget about #{BaseTaskListURL}#{taskInstance.id} -Get going ! ----powered by JBoss jBPM---]]></text> - </mail-template> - -</mail-templates> Added: jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/login/jboss-service.xml =================================================================== --- jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/login/jboss-service.xml (rev 0) +++ jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/login/jboss-service.xml 2008-07-29 11:13:37 UTC (rev 1746) @@ -0,0 +1,35 @@ +<?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> + <jaas:login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag = "required"> + <jaas:module-option name="usersProperties">META-INF/jbpm-console-users.properties</jaas:module-option> + <jaas:module-option name="rolesProperties">META-INF/jbpm-console-roles.properties</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: jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/login/jboss-service.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-roles.properties =================================================================== --- jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-roles.properties (rev 0) +++ jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-roles.properties 2008-07-29 11:13:37 UTC (rev 1746) @@ -0,0 +1,4 @@ +admin=admin,manager,user +manager=manager,user +user=user +shipper=user \ No newline at end of file Added: jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-users.properties =================================================================== --- jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-users.properties (rev 0) +++ jbossbpm/impl/jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-users.properties 2008-07-29 11:13:37 UTC (rev 1746) @@ -0,0 +1,4 @@ +admin=admin +manager=manager +user=user +shipper=shipper \ No newline at end of file Modified: jbossbpm/impl/jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- jbossbpm/impl/jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml 2008-07-29 09:49:33 UTC (rev 1745) +++ jbossbpm/impl/jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml 2008-07-29 11:13:37 UTC (rev 1746) @@ -8,7 +8,7 @@ Specify the security domain to use. This will be java:/jaas/<name> where <name> is one of the names configured in your login-config.xml. --> - <security-domain>java:/jaas/jbpm</security-domain> + <security-domain>java:/jaas/jbpm-console</security-domain> <resource-ref> <res-ref-name>jdbc/JbpmDataSource</res-ref-name> Modified: jbossbpm/impl/jbpm3/trunk/modules/distribution/pom.xml =================================================================== --- jbossbpm/impl/jbpm3/trunk/modules/distribution/pom.xml 2008-07-29 09:49:33 UTC (rev 1745) +++ jbossbpm/impl/jbpm3/trunk/modules/distribution/pom.xml 2008-07-29 11:13:37 UTC (rev 1746) @@ -53,6 +53,13 @@ </dependency> <dependency> <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-console</artifactId> + <classifier>login</classifier> + <version>${version}</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> <artifactId>jbpm-jpdl-identity</artifactId> <version>${version}</version> </dependency> @@ -155,6 +162,14 @@ <type>jar</type> <outputDirectory>${project.build.directory}/resources/jbpm-jpdl-identity</outputDirectory> </artifactItem> + <artifactItem> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-console</artifactId> + <version>${version}</version> + <classifier>login</classifier> + <type>jar</type> + <outputDirectory>${project.build.directory}/resources/jbpm-login</outputDirectory> + </artifactItem> </artifactItems> </configuration> </execution> Modified: jbossbpm/impl/jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbossbpm/impl/jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-07-29 09:49:33 UTC (rev 1745) +++ jbossbpm/impl/jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-07-29 11:13:37 UTC (rev 1746) @@ -15,7 +15,10 @@ <useStrictFiltering>true</useStrictFiltering> <unpack>false</unpack> <excludes> - <exclude>org.jboss.jbpm:jbpm-console:war</exclude> + <exclude>*:war:*</exclude> + <exclude>*:ear:*</exclude> + <exclude>*:login</exclude> + <exclude>*:config</exclude> </excludes> </dependencySet> <dependencySet> @@ -36,6 +39,14 @@ <include>org.jboss.jbpm:jbpm-bam-console-ear:ear</include> </includes> </dependencySet> + <dependencySet> + <outputDirectory>lib/jbpm-login.sar</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <unpack>true</unpack> + <includes> + <include>*:login</include> + </includes> + </dependencySet> </dependencySets> <fileSets> Modified: jbossbpm/impl/jbpm3/trunk/modules/distribution/scripts/install-definition.xml =================================================================== --- jbossbpm/impl/jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-07-29 09:49:33 UTC (rev 1745) +++ jbossbpm/impl/jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-07-29 11:13:37 UTC (rev 1746) @@ -67,8 +67,9 @@ targetdir=&quot;$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm&quot;&gt; <include>hibernate.cfg.xml</include> </file> + <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-login.sar&quot; targetdir=&quot;$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm&quot; /> </pack> - + <!-- jBPM Console --> <pack name="jBPM3 Console" required="no" installGroups="Main"> <description>The jBPM Console</description>