8:53 a.m.
Author: tom.baeyens(a)jboss.com
Date: 2009-05-14 09:53:17 -0400 (Thu, 14 May 2009)
New Revision: 4813
Modified:
jbpm4/trunk/modules/distro/src/main/files/db/example.identities.sql
jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/jbosscmp-jdbc.xml
jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/META-INF/jboss-service.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml
jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml
jbpm4/trunk/modules/pvm/pom.xml
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.repository.hbm.xml
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml
Log:
JBPM-2174 verify different table names for jbpm 4: changed prefix to JBPM4_
Modified: jbpm4/trunk/modules/distro/src/main/files/db/example.identities.sql
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/db/example.identities.sql 2009-05-14
13:36:10 UTC (rev 4812)
+++ jbpm4/trunk/modules/distro/src/main/files/db/example.identities.sql 2009-05-14
13:53:17 UTC (rev 4813)
@@ -1,17 +1,17 @@
-INSERT INTO JBPM_ID_GROUP VALUES
(1,0,'manager','manager','security-role',NULL);
-INSERT INTO JBPM_ID_GROUP VALUES
(2,0,'administrator','administrator','security-role',NULL);
-INSERT INTO JBPM_ID_GROUP VALUES
(3,0,'user','user','security-role',NULL);
-INSERT INTO JBPM_ID_GROUP VALUES(4,0,'sales','sales',NULL,NULL);
+INSERT INTO JBPM4_ID_GROUP VALUES
(1,0,'manager','manager','security-role',NULL);
+INSERT INTO JBPM4_ID_GROUP VALUES
(2,0,'administrator','administrator','security-role',NULL);
+INSERT INTO JBPM4_ID_GROUP VALUES
(3,0,'user','user','security-role',NULL);
+INSERT INTO JBPM4_ID_GROUP VALUES(4,0,'sales','sales',NULL,NULL);
-INSERT INTO JBPM_ID_USER VALUES (1,0,'alex','password','Administrator
Login','');
-INSERT INTO JBPM_ID_USER VALUES (2,0,'mike','password','Managers
Login','');
-INSERT INTO JBPM_ID_USER VALUES (3,0,'peter','password','Users
Login','');
-INSERT INTO JBPM_ID_USER VALUES (4,0,'mary','password','Users
Login','');
+INSERT INTO JBPM4_ID_USER VALUES
(1,0,'alex','password','Administrator Login','');
+INSERT INTO JBPM4_ID_USER VALUES (2,0,'mike','password','Managers
Login','');
+INSERT INTO JBPM4_ID_USER VALUES (3,0,'peter','password','Users
Login','');
+INSERT INTO JBPM4_ID_USER VALUES (4,0,'mary','password','Users
Login','');
-INSERT INTO JBPM_ID_MEMBERSHIP VALUES (1,0,1,2,NULL);
-INSERT INTO JBPM_ID_MEMBERSHIP VALUES (2,0,2,1,NULL);
-INSERT INTO JBPM_ID_MEMBERSHIP VALUES (3,0,3,3,NULL);
-INSERT INTO JBPM_ID_MEMBERSHIP VALUES (4,0,3,4,NULL);
-INSERT INTO JBPM_ID_MEMBERSHIP VALUES (5,0,4,3,NULL);
-INSERT INTO JBPM_ID_MEMBERSHIP VALUES (6,0,4,4,NULL);
+INSERT INTO JBPM4_ID_MEMBERSHIP VALUES (1,0,1,2,NULL);
+INSERT INTO JBPM4_ID_MEMBERSHIP VALUES (2,0,2,1,NULL);
+INSERT INTO JBPM4_ID_MEMBERSHIP VALUES (3,0,3,3,NULL);
+INSERT INTO JBPM4_ID_MEMBERSHIP VALUES (4,0,3,4,NULL);
+INSERT INTO JBPM4_ID_MEMBERSHIP VALUES (5,0,4,3,NULL);
+INSERT INTO JBPM4_ID_MEMBERSHIP VALUES (6,0,4,4,NULL);
Modified:
jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/jbosscmp-jdbc.xml
===================================================================
---
jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/jbosscmp-jdbc.xml 2009-05-14
13:36:10 UTC (rev 4812)
+++
jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-enterprise.jar/META-INF/jbosscmp-jdbc.xml 2009-05-14
13:53:17 UTC (rev 4813)
@@ -11,7 +11,7 @@
<enterprise-beans>
<entity>
<ejb-name>Timer</ejb-name>
- <table-name>JBPM_JOB</table-name>
+ <table-name>JBPM4_JOB</table-name>
<cmp-field>
<field-name>dbid</field-name>
<column-name>DBID_</column-name>
Modified:
jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/META-INF/jboss-service.xml
===================================================================
---
jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/META-INF/jboss-service.xml 2009-05-14
13:36:10 UTC (rev 4812)
+++
jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/deploy/jbpm/jbpm-service.sar/META-INF/jboss-service.xml 2009-05-14
13:53:17 UTC (rev 4813)
@@ -14,9 +14,9 @@
<!-- Authenticate against the Identiy 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 ID_=? </jaas:module-option>
+ <jaas:module-option name="principalsQuery"> SELECT
PASSWORD_ FROM JBPM4_ID_USER WHERE ID_=? </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
+ SELECT g.NAME_ ,'Roles' FROM JBPM4_ID_USER u, JBPM4_ID_MEMBERSHIP
m, JBPM4_ID_GROUP g
WHERE g.TYPE_='security-role' AND m.GROUP_ = g.DBID_ AND m.USER_
= u.DBID_ AND u.ID_=? </jaas:module-option>
</jaas:login-module>
</jaas:authentication>
Modified:
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml
===================================================================
---
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml 2009-05-14
13:36:10 UTC (rev 4812)
+++
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml 2009-05-14
13:53:17 UTC (rev 4813)
@@ -11,7 +11,7 @@
g="96,16,126,52">
<query>
select NAME_
- from JBPM_TASK
+ from JBPM4_TASK
where NAME_ like :name
</query>
<parameters>
@@ -26,7 +26,7 @@
g="254,16,92,52">
<query>
select count(*)
- from JBPM_TASK
+ from JBPM4_TASK
</query>
<transition to="wait" />
</sql>
Modified: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml 2009-05-14 13:36:10 UTC
(rev 4812)
+++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml 2009-05-14 13:53:17 UTC
(rev 4813)
@@ -38,7 +38,7 @@
</map>
</subclass>
- <!-- class name="org.jbpm.jpdl.internal.activity.JpdlActivity"
table="JBPM_JPDL_ACTIVITY" abstract="true"
discriminator-value="X">
+ <!-- class name="org.jbpm.jpdl.internal.activity.JpdlActivity"
table="JBPM4_JPDL_ACTIVITY" abstract="true"
discriminator-value="X">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
Modified: jbpm4/trunk/modules/pvm/pom.xml
===================================================================
--- jbpm4/trunk/modules/pvm/pom.xml 2009-05-14 13:36:10 UTC (rev 4812)
+++ jbpm4/trunk/modules/pvm/pom.xml 2009-05-14 13:53:17 UTC (rev 4813)
@@ -28,11 +28,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <!-- Properties -->
- <properties>
- <table.prefix>JBPM_</table.prefix>
-
<!--test.resources.directory>${project.build.directory}/test-resources</test.resources.directory-->
- </properties>
<repositories>
<repository>
<id>Snapshot</id>
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml 2009-05-14 13:36:10
UTC (rev 4812)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml 2009-05-14 13:53:17
UTC (rev 4813)
@@ -20,7 +20,7 @@
<!-- ### PROCESS DEFINITION ############################################# -->
<class name="ExecutionImpl"
- table="JBPM_EXECUTION"
+ table="JBPM4_EXECUTION"
discriminator-value="pvm">
<id name="dbid" column="DBID_">
<generator class="native" />
@@ -103,7 +103,7 @@
</class>
<!-- ### COMMENTS ####################################################### -->
- <class name="CommentImpl" table="JBPM_COMMENT">
+ <class name="CommentImpl" table="JBPM4_COMMENT">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
@@ -124,7 +124,7 @@
</class>
<!-- ### VARIABLE ####################################################### -->
- <class name="org.jbpm.pvm.internal.type.Variable"
abstract="true" discriminator-value=" "
table="JBPM_VARIABLE">
+ <class name="org.jbpm.pvm.internal.type.Variable"
abstract="true" discriminator-value=" "
table="JBPM4_VARIABLE">
<!-- discriminator values:
date : org.jbpm.pvm.internal.type.variable.DateVariable
double : org.jbpm.pvm.internal.type.variable.DoubleVariable
@@ -198,7 +198,7 @@
</subclass>
<!-- ### LOB ############################################################ -->
- <class name="org.jbpm.pvm.internal.lob.Lob"
table="JBPM_LOB">
+ <class name="org.jbpm.pvm.internal.lob.Lob"
table="JBPM4_LOB">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
@@ -209,7 +209,7 @@
<property name="text" type="text"
column="TEXT_VALUE_"/>
</class>
- <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB"
discriminator-value="Job">
+ <class name="org.jbpm.pvm.internal.job.JobImpl"
table="JBPM4_JOB" discriminator-value="Job">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-05-14 13:36:10
UTC (rev 4812)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-05-14 13:53:17
UTC (rev 4813)
@@ -4,7 +4,7 @@
<hibernate-mapping package="org.jbpm.pvm.internal.history.model"
default-access="field">
<!-- ### HISTORY PROCESS INSTANCE ####################################### -->
- <class name="HistoryProcessInstanceImpl"
table="JBPM_HIST_PROCINST">
+ <class name="HistoryProcessInstanceImpl"
table="JBPM4_HIST_PROCINST">
<id name="processInstanceId" column="ID_">
<generator class="assigned" />
</id>
@@ -35,7 +35,7 @@
</class>
<!-- ### HISTORY PROCESS INSTANCE ####################################### -->
- <class name="HistoryActivityInstanceImpl"
table="JBPM_HIST_ACTINST" discriminator-value="ACT">
+ <class name="HistoryActivityInstanceImpl"
table="JBPM4_HIST_ACTINST" discriminator-value="ACT">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml 2009-05-14 13:36:10
UTC (rev 4812)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml 2009-05-14 13:53:17
UTC (rev 4813)
@@ -4,7 +4,7 @@
<hibernate-mapping package="org.jbpm.pvm.internal.identity.impl"
default-access="field">
<!-- ### USER ########################################################### -->
- <class name="UserImpl" table="JBPM_ID_USER">
+ <class name="UserImpl" table="JBPM4_ID_USER">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
@@ -18,7 +18,7 @@
</class>
<!-- ### MEMBERSHIP ##################################################### -->
- <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP">
+ <class name="MembershipImpl" table="JBPM4_ID_MEMBERSHIP">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
@@ -40,7 +40,7 @@
</class>
<!-- ### GROUP ########################################################### -->
- <class name="GroupImpl" table="JBPM_ID_GROUP">
+ <class name="GroupImpl" table="JBPM4_ID_GROUP">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.repository.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.repository.hbm.xml 2009-05-14 13:36:10
UTC (rev 4812)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.repository.hbm.xml 2009-05-14 13:53:17
UTC (rev 4813)
@@ -5,7 +5,7 @@
<!-- ### Deployment ##################################################### -->
<class name="org.jbpm.pvm.internal.repository.DeploymentImpl"
- table="JBPM_DEPLOYMENT">
+ table="JBPM4_DEPLOYMENT">
<!-- ProcessElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<id name="dbid" column="DBID_">
@@ -25,7 +25,7 @@
</map>
<set name="objectProperties"
- table="JBPM_DEPLOYPROPS"
+ table="JBPM4_DEPLOYPROPS"
cascade="all">
<key column="DEPLOYMENT_" />
<one-to-many
class="org.jbpm.pvm.internal.repository.DeploymentProperty" />
@@ -33,7 +33,7 @@
</class>
- <class name="org.jbpm.pvm.internal.repository.DeploymentProperty"
table="JBPM_DEPLOYPROP">
+ <class name="org.jbpm.pvm.internal.repository.DeploymentProperty"
table="JBPM4_DEPLOYPROP">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml 2009-05-14 13:36:10 UTC
(rev 4812)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml 2009-05-14 13:53:17 UTC
(rev 4813)
@@ -6,7 +6,7 @@
<!-- ### ASSIGNABLE DEFINITIONS #########################################
<class name="AssignableDefinitionImpl"
- table="JBPM_ASSIGNDEF"
+ table="JBPM4_ASSIGNDEF"
discriminator-value="A" >
<id name="dbid" column="DBID_">
<generator class="native" />
@@ -65,7 +65,7 @@
<!-- ### TASK ########################################################### -->
<class name="TaskImpl"
- table="JBPM_TASK"
+ table="JBPM4_TASK"
discriminator-value="T">
<id name="dbid" column="DBID_">
<generator class="native" />
@@ -136,7 +136,7 @@
</class>
<!-- ### PARTICIPANT #################################################### -->
- <class name="ParticipationImpl" table="JBPM_PARTICIPATION">
+ <class name="ParticipationImpl" table="JBPM4_PARTICIPATION">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>
@@ -160,7 +160,7 @@
</class>
<!-- ### SWIMLANE ####################################################### -->
- <class name="SwimlaneImpl" table="JBPM_SWIMLANE">
+ <class name="SwimlaneImpl" table="JBPM4_SWIMLANE">
<id name="dbid" column="DBID_">
<generator class="native" />
</id>