[jbpm-commits] JBoss JBPM SVN: r4241 - in jbpm4/branches/tbaeyens: modules/examples/src/test/resources and 5 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Mar 13 17:58:53 EDT 2009


Author: tom.baeyens at jboss.com
Date: 2009-03-13 17:58:53 -0400 (Fri, 13 Mar 2009)
New Revision: 4241

Modified:
   jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml
   jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml
   jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/META-INF/persistence.xml
   jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml
   jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml
   jbpm4/branches/tbaeyens/windows/test.distro.bat
Log:
work

Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml	2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml	2009-03-13 21:58:53 UTC (rev 4241)
@@ -35,11 +35,12 @@
     <mkdir dir="${deploy.artifacts.dir}/resources/hsqldb" />
 
     <echo message="creating hsqldb db" />
-    <ant antfile="src/main/resources/config-tool/build.xml" 
+    <ant antfile="build.xml" 
     	   target="db.create" 
-    	   inheritall="false">
+    	   inheritall="false"
+         dir="src/main/resources/config-tool">
       <property name="database" value="hsqldb.url" />
-      <property name="jdbc.hsqldb.url" value="jdbc:hsqldb:file:target/deploy-artifacts/resources/hypersonic/Jbpm4DB" />
+      <property name="jdbc.hsqldb.url" value="jdbc:hsqldb:file:../../../../target/deploy-artifacts/resources/hypersonic/Jbpm4DB" />
       <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-hsqldb-config" />
       <property name="db.scripts.dir" value="${output.dir}/config.tool.tmp/hsqldb.scripts" />
       <property name="tmp.dir" value="${output.dir}/config.tool.tmp" />

Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml	2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml	2009-03-13 21:58:53 UTC (rev 4241)
@@ -9,7 +9,6 @@
     <history-service />
     <management-service />
     <task-service />
-    <identity-service />
 
     <command-service>
       <retry-interceptor />
@@ -25,8 +24,6 @@
 
     <hibernate-session-factory />
 
-    <identity-session-factory resource="jbpm.identity.cfg.xml" />
-
     <deployer-manager>
       <assign-file-type>
         <file extension=".jpdl.xml" type="jpdl" />
@@ -69,7 +66,6 @@
     <message-session />
     <timer-session />
     <history-session />
-    <identity-session realm="realm://jbpm-identity" />
   </transaction-context>
 
 </jbpm-configuration>

Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml	2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml	2009-03-13 21:58:53 UTC (rev 4241)
@@ -9,7 +9,6 @@
     <history-service />
     <management-service />
     <task-service />
-    <identity-service />
 
     <command-service>
       <retry-interceptor />
@@ -25,8 +24,6 @@
 
     <hibernate-session-factory />
 
-    <identity-session-factory resource="jbpm.identity.cfg.xml" />
-
     <deployer-manager>
       <assign-file-type>
         <file extension=".jpdl.xml" type="jpdl" />
@@ -69,7 +66,6 @@
     <message-session />
     <timer-session />
     <history-session />
-    <identity-session realm="realm://jbpm-identity" />
   </transaction-context>
 
 </jbpm-configuration>

Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml	2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml	2009-03-13 21:58:53 UTC (rev 4241)
@@ -18,6 +18,12 @@
     <property name="state" column="STATE_" />
     <property name="endActivityName" column="ENDACTIVITY_" />
 
+    <many-to-one name="processDefinition" 
+                 class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" 
+                 column="PROCDEF_"
+                 foreign-key="FK_HISTPI_PROCDEF"
+                 index="IDX_HISTPI_PROCDEF" />
+                 
     <set name="historyActivityInstances"
          cascade="all">
       <key>

Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/META-INF/persistence.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/META-INF/persistence.xml	2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/META-INF/persistence.xml	2009-03-13 21:58:53 UTC (rev 4241)
@@ -9,7 +9,7 @@
   <persistence-unit name="jboss-identity-jbpm" transaction-type="RESOURCE_LOCAL">
 
     <provider>org.hibernate.ejb.HibernatePersistence</provider>
-
+    
     <class>org.jboss.identity.idm.impl.model.hibernate.HibernateRealm</class>
     <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject</class>
     <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential</class>

Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml	2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml	2009-03-13 21:58:53 UTC (rev 4241)
@@ -18,6 +18,12 @@
     <property name="state" column="STATE_" />
     <property name="endActivityName" column="ENDACTIVITY_" />
 
+    <many-to-one name="processDefinition" 
+                 class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" 
+                 column="PROCDEF_"
+                 foreign-key="FK_HISTPI_PROCDEF"
+                 index="IDX_HISTPI_PROCDEF" />
+                 
     <set name="historyActivityInstances"
          cascade="all">
       <key>

Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml	2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml	2009-03-13 21:58:53 UTC (rev 4241)
@@ -9,7 +9,6 @@
     <history-service />
     <management-service />
     <task-service />
-    <identity-service />
 
     <command-service>
       <retry-interceptor />
@@ -25,8 +24,6 @@
 
     <hibernate-session-factory />
 
-    <identity-session-factory resource="jbpm.identity.cfg.xml" />
-
     <deployer-manager>
       <assign-file-type>
         <file extension=".jpdl.xml" type="jpdl" />
@@ -69,7 +66,6 @@
     <message-session />
     <timer-session />
     <history-session />
-    <identity-session realm="realm://jbpm-identity" />
   </transaction-context>
 
 </jbpm-configuration>

Modified: jbpm4/branches/tbaeyens/windows/test.distro.bat
===================================================================
--- jbpm4/branches/tbaeyens/windows/test.distro.bat	2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/windows/test.distro.bat	2009-03-13 21:58:53 UTC (rev 4241)
@@ -13,5 +13,5 @@
 cmd /C mvn -DskipTests -Pdistro -Ddatabase=%DATABASE% -Djbpm.target.container=%CONTAINER% -Djboss.home=%JBOSS_HOME% clean install
 rmdir /S /Q %JBOSS_HOME%
 unzip -q %JBOSS_DISTRO_FILE% -d c:\Software
-java -jar modules\distro\target\jbpm-installer-%JBPM_VERSION%.jar modules\distro\target\resources\auto-install-template.xml
+java -DTRACE -jar modules\distro\target\jbpm-installer-%JBPM_VERSION%.jar modules\distro\target\resources\auto-install-template.xml
 start "JBoss" %JBOSS_HOME%\bin\run.bat




More information about the jbpm-commits mailing list