Author: thomas.diesler(a)jboss.com Date: 2008-08-29 06:41:37 -0400 (Fri, 29 Aug 2008) New Revision: 2047 Added: jbpm3/trunk/modules/console/scripts/assembly-service.xml Removed: jbpm3/trunk/modules/console/scripts/assembly-config.xml jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-roles.properties jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-users.properties Modified: jbpm3/trunk/modules/console/.classpath jbpm3/trunk/modules/console/pom.xml jbpm3/trunk/modules/console/src/main/resources/login/jboss-service.xml jbpm3/trunk/modules/distribution/pom.xml jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml jbpm3/trunk/modules/distribution/scripts/install-definition.xml jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml jbpm3/trunk/pom.xml Log: Resurect jbpm-console Modified: jbpm3/trunk/modules/console/.classpath =================================================================== --- jbpm3/trunk/modules/console/.classpath 2008-08-29 08:41:42 UTC (rev 2046) +++ jbpm3/trunk/modules/console/.classpath 2008-08-29 10:41:37 UTC (rev 2047) @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: jbpm3/trunk/modules/console/pom.xml =================================================================== --- jbpm3/trunk/modules/console/pom.xml 2008-08-29 08:41:42 UTC (rev 2046) +++ jbpm3/trunk/modules/console/pom.xml 2008-08-29 10:41:37 UTC (rev 2047) @@ -120,7 +120,7 @@ <finalName>${project.build.finalName}</finalName> <appendAssemblyId>true</appendAssemblyId> <descriptors> - <descriptor>scripts/assembly-config.xml</descriptor> + <descriptor>scripts/assembly-service.xml</descriptor> </descriptors> </configuration> </execution> Deleted: jbpm3/trunk/modules/console/scripts/assembly-config.xml =================================================================== --- jbpm3/trunk/modules/console/scripts/assembly-config.xml 2008-08-29 08:41:42 UTC (rev 2046) +++ jbpm3/trunk/modules/console/scripts/assembly-config.xml 2008-08-29 10:41:37 UTC (rev 2047) @@ -1,26 +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>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 Added: jbpm3/trunk/modules/console/scripts/assembly-service.xml =================================================================== --- jbpm3/trunk/modules/console/scripts/assembly-service.xml (rev 0) +++ jbpm3/trunk/modules/console/scripts/assembly-service.xml 2008-08-29 10:41:37 UTC (rev 2047) @@ -0,0 +1,17 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>service</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/main/resources/login</directory> + <outputDirectory>/META-INF</outputDirectory> + <includes> + <include>jboss-service.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: jbpm3/trunk/modules/console/scripts/assembly-service.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm3/trunk/modules/console/src/main/resources/login/jboss-service.xml =================================================================== --- jbpm3/trunk/modules/console/src/main/resources/login/jboss-service.xml 2008-08-29 08:41:42 UTC (rev 2046) +++ jbpm3/trunk/modules/console/src/main/resources/login/jboss-service.xml 2008-08-29 10:41:37 UTC (rev 2047) @@ -1,35 +1,27 @@ <?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> - + <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.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> \ No newline at end of file Deleted: jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-roles.properties =================================================================== --- jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-roles.properties 2008-08-29 08:41:42 UTC (rev 2046) +++ jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-roles.properties 2008-08-29 10:41:37 UTC (rev 2047) @@ -1,4 +0,0 @@ -admin=admin,manager,user -manager=manager,user -user=user -shipper=user \ No newline at end of file Deleted: jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-users.properties =================================================================== --- jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-users.properties 2008-08-29 08:41:42 UTC (rev 2046) +++ jbpm3/trunk/modules/console/src/main/resources/login/jbpm-console-users.properties 2008-08-29 10:41:37 UTC (rev 2047) @@ -1,4 +0,0 @@ -admin=admin -manager=manager -user=user -shipper=shipper \ No newline at end of file Modified: jbpm3/trunk/modules/distribution/pom.xml =================================================================== --- jbpm3/trunk/modules/distribution/pom.xml 2008-08-29 08:41:42 UTC (rev 2046) +++ jbpm3/trunk/modules/distribution/pom.xml 2008-08-29 10:41:37 UTC (rev 2047) @@ -28,6 +28,19 @@ <dependencies> <dependency> <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-console</artifactId> + <version>${version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-console</artifactId> + <classifier>service</classifier> + <version>${version}</version> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> <artifactId>jbpm-jpdl-core</artifactId> <version>${version}</version> </dependency> Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-08-29 08:41:42 UTC (rev 2046) +++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-08-29 10:41:37 UTC (rev 2047) @@ -21,8 +21,8 @@ <property name="resources.dir" value="${basedir}/src/main/resources" /> <property name="filtered.resources.dir" value="${output.dir}/resources" /> <property name="deploy.artifacts.dir" value="${output.dir}/deploy-artifacts" /> + <property name="deploy.artifacts.lib" value="${deploy.artifacts.dir}/lib" /> - <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> @@ -66,14 +66,16 @@ </classpath> </taskdef> - <property name="izpack.temp.dir" value="${output.dir}/izpack-temp" /> <mkdir dir="${izpack.temp.dir}" /> + <!-- http://jira.codehaus.org/browse/IZPACK-151 --> + <copy file="${deploy.artifacts.lib}/jbpm-console.war" tofile="${deploy.artifacts.lib}/jbpm-console.zip"/> + <!-- Run installer build --> <echo message="Running IzPack to build the installer..." /> - <izpack input="${basedir}/scripts/install-definition.xml" output="${output.dir}/${product.short.name}-${product.version}-izpack.jar" installerType="standard" - inheritAll="true" basedir="${izpack.temp.dir}" /> + <izpack input="${basedir}/scripts/install-definition.xml" output="${output.dir}/${product.short.name}-${product.version}-izpack.jar" + installerType="standard" inheritAll="true" basedir="${izpack.temp.dir}" /> <!-- Clean working directory --> <delete dir="${izpack.temp.dir}" quiet="true" includeemptydirs="true" /> Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-08-29 08:41:42 UTC (rev 2046) +++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-08-29 10:41:37 UTC (rev 2047) @@ -15,6 +15,14 @@ <useStrictFiltering>true</useStrictFiltering> <unpack>false</unpack> </dependencySet> + <dependencySet> + <outputDirectory>resources/jbpm-jpdl-core-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-jpdl-core:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> </dependencySets> <fileSets> Modified: jbpm3/trunk/modules/distribution/scripts/install-definition.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-08-29 08:41:42 UTC (rev 2046) +++ jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-08-29 10:41:37 UTC (rev 2047) @@ -51,31 +51,35 @@ <!-- jBPM Main Components --> <pack name="jBPM3" required="yes" installGroups="Main"> <description>The jBPM Main Components</description> - <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir=&quot;$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm&quot; > + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir=&quot;$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm&quot; + override="true"> <include name="jboss-bpm-api.jar"/> <include name="jbpm-jbpm4jsf.jar"/> - <include name="jbpm-jpdl-core.jar"/> <include name="jbpm-jpdl-identity.jar"/> <include name="jbpm-jpdl-integration.jar"/> </fileset> + <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-console.zip&quot; targetdir=&quot;$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm/jbpm-console.war&quot; + unpack="true" override="true"/> + <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-console-service.zip&quot; targetdir=&quot;$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm/jbpm-service.sar&quot; + unpack="true" override="true"/> </pack> <!-- jBPM Distro config --> <pack name="jBPM3 Config" required="yes" installGroups="Main"> <description>The jBPM default configuration</description> - <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-jpdl-core-config.jar&quot; - 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}/resources/jbpm-jpdl-core-config/hibernate.cfg.xml&quot; + targetdir=&quot;$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm/jbpm-service.sar&quot;/&gt; </pack> <!-- jBPM Hypersonic Database --> <pack name="jBPM3 Hypersonic Database Scripts" required="no" installGroups="Main"> <description>The Hypersonic Database Scripts</description> - <fileset dir=&quot;(a){resources.dir}/database/hypersonic&quot; targetdir=&quot;$INSTALL_PATH/server/(a){jboss.server.instance}/data&quot; > - <include name="hypersonic/**"/> + <fileset dir=&quot;(a){resources.dir}/database&quot; targetdir=&quot;$INSTALL_PATH/server/(a){jboss.server.instance}/data&quot; + override="asktrue"> + <include name="hypersonic/jbpmDB.*"/> </fileset> - <fileset dir=&quot;(a){resources.dir}/database/hypersonic&quot; targetdir=&quot;$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm&quot; > + <fileset dir=&quot;(a){resources.dir}/database/hypersonic&quot; targetdir=&quot;$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm&quot; + override="asktrue"> <include name="jbpm-ds.xml"/> </fileset> </pack> Modified: jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml =================================================================== --- jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml 2008-08-29 08:41:42 UTC (rev 2046) +++ jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml 2008-08-29 10:41:37 UTC (rev 2047) @@ -26,12 +26,5 @@ <include>hibernate.cfg.xml</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 Modified: jbpm3/trunk/pom.xml =================================================================== --- jbpm3/trunk/pom.xml 2008-08-29 08:41:42 UTC (rev 2046) +++ jbpm3/trunk/pom.xml 2008-08-29 10:41:37 UTC (rev 2047) @@ -28,6 +28,7 @@ <!-- Modules --> <modules> <module>modules/jpdl</module> + <module>modules/console</module> <module>modules/enterprise</module> <module>modules/jbpm4jsf</module> </modules>