[jbpm-commits] JBoss JBPM SVN: r2436 - in jbpm3/trunk/modules: examples and 2 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Sep 29 07:12:31 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-09-29 07:12:31 -0400 (Mon, 29 Sep 2008)
New Revision: 2436

Added:
   jbpm3/trunk/modules/core/src/main/resources/hibernate.identity.hbm.xml
   jbpm3/trunk/modules/identity/src/main/resources/hibernate.identity.hbm.xml
Removed:
   jbpm3/trunk/modules/identity/src/main/resources/hibernate.extra.hbm.xml
Modified:
   jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml
   jbpm3/trunk/modules/examples/pom.xml
   jbpm3/trunk/modules/identity/scripts/assembly-config.xml
Log:
[JBPM-1290] Integrate example tests in automated testrun

Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml	2008-09-29 11:01:34 UTC (rev 2435)
+++ jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml	2008-09-29 11:12:31 UTC (rev 2436)
@@ -34,3 +34,5 @@
 
     <!-- Additional mappings defined per module go here -->
     <mapping resource="hibernate.extra.hbm.xml" />
+    <mapping resource="hibernate.identity.hbm.xml" />
+    
\ No newline at end of file

Added: jbpm3/trunk/modules/core/src/main/resources/hibernate.identity.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/hibernate.identity.hbm.xml	                        (rev 0)
+++ jbpm3/trunk/modules/core/src/main/resources/hibernate.identity.hbm.xml	2008-09-29 11:12:31 UTC (rev 2436)
@@ -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/core/src/main/resources/hibernate.identity.hbm.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: jbpm3/trunk/modules/examples/pom.xml
===================================================================
--- jbpm3/trunk/modules/examples/pom.xml	2008-09-29 11:01:34 UTC (rev 2435)
+++ jbpm3/trunk/modules/examples/pom.xml	2008-09-29 11:12:31 UTC (rev 2436)
@@ -101,10 +101,6 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <!-- [JBPM-1290] Integrate example tests in automated testrun -->
-          <excludes>
-            <exclude>org/jbpm/examples/websale/**</exclude>
-          </excludes>
         </configuration>
       </plugin>
     </plugins>

Modified: jbpm3/trunk/modules/identity/scripts/assembly-config.xml
===================================================================
--- jbpm3/trunk/modules/identity/scripts/assembly-config.xml	2008-09-29 11:01:34 UTC (rev 2435)
+++ jbpm3/trunk/modules/identity/scripts/assembly-config.xml	2008-09-29 11:12:31 UTC (rev 2436)
@@ -10,7 +10,7 @@
       <directory>src/main/resources</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>hibernate.extra.hbm.xml</include>
+        <include>hibernate.identity.hbm.xml</include>
       </includes>
     </fileSet>
   </fileSets>

Deleted: jbpm3/trunk/modules/identity/src/main/resources/hibernate.extra.hbm.xml
===================================================================
--- jbpm3/trunk/modules/identity/src/main/resources/hibernate.extra.hbm.xml	2008-09-29 11:01:34 UTC (rev 2435)
+++ jbpm3/trunk/modules/identity/src/main/resources/hibernate.extra.hbm.xml	2008-09-29 11:12:31 UTC (rev 2436)
@@ -1,78 +0,0 @@
-<?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>

Copied: jbpm3/trunk/modules/identity/src/main/resources/hibernate.identity.hbm.xml (from rev 2423, jbpm3/trunk/modules/identity/src/main/resources/hibernate.extra.hbm.xml)
===================================================================
--- jbpm3/trunk/modules/identity/src/main/resources/hibernate.identity.hbm.xml	                        (rev 0)
+++ jbpm3/trunk/modules/identity/src/main/resources/hibernate.identity.hbm.xml	2008-09-29 11:12:31 UTC (rev 2436)
@@ -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>




More information about the jbpm-commits mailing list