[jbpm-commits] JBoss JBPM SVN: r2037 - in jbpm3/trunk: modules/jpdl/core and 5 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-08-28 06:10:00 -0400 (Thu, 28 Aug 2008) New Revision: 2037 Added: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.extra.hbm.xml jbpm3/trunk/modules/jpdl/identity/src/main/resources/hibernate.extra.hbm.xml jbpm3/trunk/modules/jpdl/identity/src/main/resources/identity.gif Removed: jbpm3/trunk/modules/jpdl/identity/src/main/resources/hibernate.mapping.xml jbpm3/trunk/modules/jpdl/identity/src/main/resources/org/ jbpm3/trunk/modules/jpdl/identity/src/main/scripts/ Modified: jbpm3/trunk/modules/jpdl/core/pom.xml jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.xml jbpm3/trunk/modules/jpdl/identity/pom.xml jbpm3/trunk/pom.xml Log: Add hibernate.extra.hbm.xml to externalize module specific mappings Modified: jbpm3/trunk/modules/jpdl/core/pom.xml =================================================================== --- jbpm3/trunk/modules/jpdl/core/pom.xml 2008-08-28 05:46:43 UTC (rev 2036) +++ jbpm3/trunk/modules/jpdl/core/pom.xml 2008-08-28 10:10:00 UTC (rev 2037) @@ -99,16 +99,6 @@ <!-- Plugins --> <build> - <resources> - <resource> - <targetPath>/</targetPath> - <filtering>false</filtering> - <directory>${basedir}/src/main/resources</directory> - <excludes> - <exclude>hibernate.*.xml</exclude> - </excludes> - </resource> - </resources> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> @@ -211,93 +201,5 @@ <!-- Profiles --> <profiles> - - <!-- - Name: no-database - Descr: Setup the default database - --> - <profile> - <id>no-database</id> - <activation> - <property> - <name>!database</name> - </property> - </activation> - <properties> - <database>hsqldb</database> - </properties> - <dependencies> - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - - <!-- - Name: hsqldb - Descr: Hypersonic Database Setup - --> - <profile> - <id>hsqldb</id> - <activation> - <property> - <name>database</name> - <value>hsqldb</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - - <!-- - Name: mysql - Descr: MySQL Database Setup - --> - <profile> - <id>mysql</id> - <activation> - <property> - <name>database</name> - <value>mysql</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - - <!-- - Name: postgresql - Descr: MySQL Database Setup - --> - <profile> - <id>postgresql</id> - <activation> - <property> - <name>database</name> - <value>postgresql</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <classifier>jdbc3</classifier> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - </profiles> -</project> \ No newline at end of file +</project> Modified: jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml =================================================================== --- jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml 2008-08-28 05:46:43 UTC (rev 2036) +++ jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml 2008-08-28 10:10:00 UTC (rev 2037) @@ -15,9 +15,8 @@ <property name="project.build.directory" value="${basedir}/target"/> <property name="project.resources.directory" value="${basedir}/src/main/resources"/> - <!-- Concat hibernate.cfg.xml --> - <target name="concat"> - + <target name="check-database"> + <property name="hibernate.properties.xml" value="hibernate.properties.${database}.xml"/> <available property="database.properties.available" file="${project.resources.directory}/${hibernate.properties.xml}"/> <fail message="${hibernate.properties.xml} not available" unless="database.properties.available"/> @@ -26,6 +25,11 @@ <echo message="Concat hibernate.cfg.xml using ${hibernate.properties.xml}" /> <echo/> + </target> + + <target name="concat" depends="check-database"> + + <!-- Concat hibernate.cfg.xml --> <concat destfile="${project.build.directory}/classes/hibernate.cfg.xml"> <header trimleading="yes"><![CDATA[<?xml version='1.0' encoding='utf-8'?> Modified: jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml =================================================================== --- jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml 2008-08-28 05:46:43 UTC (rev 2036) +++ jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml 2008-08-28 10:10:00 UTC (rev 2037) @@ -10,14 +10,22 @@ <directory>src/main/resources</directory> <outputDirectory>/</outputDirectory> <includes> - <include>hibernate.properties.xml</include> - <include>hibernate.mapping.xml</include> - <include>hibernate.cache.xml</include> + <include>hibernate.*</include> <include>jbpm.cfg.xml</include> <include>jbpm.mail.templates.xml</include> </includes> + <excludes> + <exclude>hibernate.extra.hbm.xml</exclude> + </excludes> </fileSet> <fileSet> + <directory>target/classes</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>hibernate.cfg.xml</include> + </includes> + </fileSet> + <fileSet> <directory>src/test/resources</directory> <outputDirectory>/</outputDirectory> <includes> Added: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.extra.hbm.xml =================================================================== --- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.extra.hbm.xml (rev 0) +++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.extra.hbm.xml 2008-08-28 10:10:00 UTC (rev 2037) @@ -0,0 +1,13 @@ +<?xml version="1.0"?> + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping> + + <!-- ################################################## --> + <!-- # Additional mappings defined per module go here # --> + <!-- ################################################## --> + +</hibernate-mapping> Property changes on: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.extra.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.xml =================================================================== --- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.xml 2008-08-28 05:46:43 UTC (rev 2036) +++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.xml 2008-08-28 10:10:00 UTC (rev 2037) @@ -1,26 +1,27 @@ -<!-- ############################################ --> + <!-- ############################################ --> <!-- # mapping files with external dependencies # --> <!-- ############################################ --> + <!-- Additional mappings defined per module go here --> + <mapping resource="hibernate.extra.hbm.xml" /> + <!-- following mapping files have a dependency on --> <!-- 'jbpm-identity.jar', mapping files --> <!-- of the pluggable jbpm identity component. --> <!-- Uncomment the following 3 lines if you --> <!-- want to use the jBPM identity mgmgt --> <!-- component. --> - <!-- identity mappings (begin) === + <!-- <mapping resource="org/jbpm/identity/User.hbm.xml"/> <mapping resource="org/jbpm/identity/Group.hbm.xml"/> <mapping resource="org/jbpm/identity/Membership.hbm.xml"/> - ==== identity mappings (end) --> + --> - <!-- following mapping files have a dependency on --> - <!-- the JCR API --> - <!-- jcr mappings (begin) === + <!-- following mapping files have a dependency on the JCR API --> + <!-- <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/> - ==== jcr mappings (end) --> + --> - <!-- ###################### --> <!-- # jbpm mapping files # --> <!-- ###################### --> Modified: jbpm3/trunk/modules/jpdl/identity/pom.xml =================================================================== --- jbpm3/trunk/modules/jpdl/identity/pom.xml 2008-08-28 05:46:43 UTC (rev 2036) +++ jbpm3/trunk/modules/jpdl/identity/pom.xml 2008-08-28 10:10:00 UTC (rev 2037) @@ -10,152 +10,74 @@ <!-- ====================================================================== --> <!-- $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 - jPDL Identity</name> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-jpdl-identity</artifactId> + <packaging>jar</packaging> - <name>JBoss jBPM - jPDL Identity</name> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-jpdl-identity</artifactId> - <packaging>jar</packaging> - <!-- Parent --> - <parent> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-jpdl</artifactId> - <version>3.3.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-jpdl</artifactId> + <version>3.3.0-SNAPSHOT</version> + </parent> <!-- Dependencies --> - <dependencies> + <dependencies> <!-- jBPM Dependencies --> - <dependency> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-jpdl-core</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-jpdl-core</artifactId> - <classifier>config</classifier> - <version>${version}</version> - </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-jpdl-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-jpdl-core</artifactId> + <classifier>config</classifier> + <version>${version}</version> + </dependency> <!-- Provided Dependencies --> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <scope>provided</scope> + </dependency> <!-- Test Dependencies --> - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <!-- Plugins --> - <build> - <resources> - <resource> - <targetPath>/</targetPath> - <filtering>false</filtering> - <directory>${basedir}/src/main/resources</directory> - <excludes> - <exclude>hibernate.mapping.xml</exclude> - </excludes> - </resource> - </resources> - - <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>src/main/scripts/assembly-config.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <showDeprecation>false</showDeprecation> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <showDeprecation>false</showDeprecation> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> <!-- Tests not part of AllTests --> - <exclude>org/jbpm/identity/IdentityDbTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>generate-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-jpdl-core</artifactId> - <version>${version}</version> - <classifier>config</classifier> - <type>jar</type> - <outputDirectory>${project.build.directory}/resources/jbpm-jpdl-core</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant antfile="src/main/scripts/antrun-jbpm-config.xml"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> + <exclude>org/jbpm/identity/IdentityDbTestCase.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: jbpm3/trunk/modules/jpdl/identity/src/main/resources/hibernate.extra.hbm.xml =================================================================== --- jbpm3/trunk/modules/jpdl/identity/src/main/resources/hibernate.extra.hbm.xml (rev 0) +++ jbpm3/trunk/modules/jpdl/identity/src/main/resources/hibernate.extra.hbm.xml 2008-08-28 10:10:00 UTC (rev 2037) @@ -0,0 +1,78 @@ +<?xml version="1.0"?> + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping auto-import="false" default-access="field"> + + <class name="org.jbpm.identity.User" + table="JBPM_ID_USER" + discriminator-value="U"> + <id name="id" column="ID_"><generator class="native" /></id> + <discriminator type="char" column="CLASS_"/> + <property name="name" column="NAME_"/> + <property name="email" column="EMAIL_"/> + <property name="password" column="PASSWORD_"/> + <set name="memberships" cascade="all"> + <key column="USER_" /> + <one-to-many class="org.jbpm.identity.Membership" /> + </set> + <set name="permissions" cascade="all" table="JBPM_ID_PERMISSIONS"> + <key column="ENTITY_" foreign-key="none" /> + <element type="org.jbpm.identity.hibernate.PermissionUserType"> + <column name="CLASS_"/> + <column name="NAME_"/> + <column name="ACTION_"/> + </element> + </set> + </class> + + <class name="org.jbpm.identity.Group" + table="JBPM_ID_GROUP" + discriminator-value="G"> + <id name="id" column="ID_"><generator class="native" /></id> + <discriminator type="char" column="CLASS_"/> + <property name="name" column="NAME_"/> + <property name="type" column="TYPE_"/> + <many-to-one name="parent" column="PARENT_" foreign-key="FK_ID_GRP_PARENT"/> + <set name="children" cascade="all"> + <key column="PARENT_" /> + <one-to-many class="org.jbpm.identity.Group" /> + </set> + <set name="memberships" cascade="all"> + <key column="GROUP_" /> + <one-to-many class="org.jbpm.identity.Membership" /> + </set> + <set name="permissions" cascade="all" table="JBPM_ID_PERMISSIONS" > + <key column="ENTITY_" foreign-key="none" /> + <element type="org.jbpm.identity.hibernate.PermissionUserType"> + <column name="CLASS_"/> + <column name="NAME_"/> + <column name="ACTION_"/> + </element> + </set> + </class> + + <class name="org.jbpm.identity.Membership" + table="JBPM_ID_MEMBERSHIP" + discriminator-value="M"> + <id name="id" column="ID_"><generator class="native" /></id> + <discriminator type="char" column="CLASS_"/> + <property name="name" column="NAME_"/> + <property name="role" column="ROLE_"/> + <many-to-one name="user" column="USER_" cascade="save-update" + foreign-key="FK_ID_MEMSHIP_USR"/> + <many-to-one name="group" column="GROUP_" cascade="save-update" + foreign-key="FK_ID_MEMSHIP_GRP"/> + <set name="permissions" cascade="all" table="JBPM_ID_PERMISSIONS"> + <key column="ENTITY_" foreign-key="none" /> + <element type="org.jbpm.identity.hibernate.PermissionUserType"> + <column name="CLASS_"/> + <column name="NAME_"/> + <column name="ACTION_"/> + </element> + </set> + </class> + +</hibernate-mapping> Property changes on: jbpm3/trunk/modules/jpdl/identity/src/main/resources/hibernate.extra.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: jbpm3/trunk/modules/jpdl/identity/src/main/resources/hibernate.mapping.xml =================================================================== --- jbpm3/trunk/modules/jpdl/identity/src/main/resources/hibernate.mapping.xml 2008-08-28 05:46:43 UTC (rev 2036) +++ jbpm3/trunk/modules/jpdl/identity/src/main/resources/hibernate.mapping.xml 2008-08-28 10:10:00 UTC (rev 2037) @@ -1,16 +0,0 @@ -<!-- - ================================================================================== - START org.jboss.jbpm:jbpm-jpdl-identity src/main/resources/hibernate.cfg.xml - ================================================================================== ---> - - <!-- identity mappings --> - <mapping resource="org/jbpm/identity/User.hbm.xml"/> - <mapping resource="org/jbpm/identity/Group.hbm.xml"/> - <mapping resource="org/jbpm/identity/Membership.hbm.xml"/> - -<!-- - ================================================================================== - END org.jboss.jbpm:jbpm-jpdl-identity src/main/resources/hibernate.cfg.xml - ================================================================================== - --> \ No newline at end of file Copied: jbpm3/trunk/modules/jpdl/identity/src/main/resources/identity.gif (from rev 2036, jbpm3/trunk/modules/jpdl/identity/src/main/resources/org/jbpm/identity/identity.gif) =================================================================== (Binary files differ) Modified: jbpm3/trunk/pom.xml =================================================================== --- jbpm3/trunk/pom.xml 2008-08-28 05:46:43 UTC (rev 2036) +++ jbpm3/trunk/pom.xml 2008-08-28 10:10:00 UTC (rev 2037) @@ -402,6 +402,12 @@ <url>http://repository.jboss.org/maven2</url> </repository> </repositories> + <pluginRepositories> + <pluginRepository> + <id>gwt-maven</id> + <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url> + </pluginRepository> + </pluginRepositories> <!-- Profiles --> <profiles> @@ -444,11 +450,93 @@ </plugins> </build> </profile> + + <!-- + Name: no-database + Descr: Setup the default database + --> + <profile> + <id>no-database</id> + <activation> + <property> + <name>!database</name> + </property> + </activation> + <properties> + <database>hsqldb</database> + </properties> + <dependencies> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + + <!-- + Name: hsqldb + Descr: Hypersonic Database Setup + --> + <profile> + <id>hsqldb</id> + <activation> + <property> + <name>database</name> + <value>hsqldb</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + + <!-- + Name: mysql + Descr: MySQL Database Setup + --> + <profile> + <id>mysql</id> + <activation> + <property> + <name>database</name> + <value>mysql</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + + <!-- + Name: postgresql + Descr: MySQL Database Setup + --> + <profile> + <id>postgresql</id> + <activation> + <property> + <name>database</name> + <value>postgresql</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <classifier>jdbc3</classifier> + <scope>test</scope> + </dependency> + </dependencies> + </profile> </profiles> - <pluginRepositories> - <pluginRepository> - <id>gwt-maven</id> - <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url> - </pluginRepository> - </pluginRepositories> -</project> \ No newline at end of file + +</project>