[jbpm-commits] JBoss JBPM SVN: r4235 - in jbpm4/branches/tbaeyens: modules/distro and 9 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Mar 12 10:36:32 EDT 2009


Author: tom.baeyens at jboss.com
Date: 2009-03-12 10:36:32 -0400 (Thu, 12 Mar 2009)
New Revision: 4235

Removed:
   jbpm4/branches/tbaeyens/modules/distro/src/main/resources/examples-hibernate.cfg.xml
Modified:
   jbpm4/branches/tbaeyens/build.xml
   jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties
   jbpm4/branches/tbaeyens/modules/distro/pom.xml
   jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml
   jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.properties
   jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part1.persistence.xml
   jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml
   jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java
   jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties
   jbpm4/branches/tbaeyens/pom.xml
   jbpm4/branches/tbaeyens/windows/test.distro.bat
Log:
work

Modified: jbpm4/branches/tbaeyens/build.xml
===================================================================
--- jbpm4/branches/tbaeyens/build.xml	2009-03-12 14:28:45 UTC (rev 4234)
+++ jbpm4/branches/tbaeyens/build.xml	2009-03-12 14:36:32 UTC (rev 4235)
@@ -139,6 +139,7 @@
       <property name="config.files.dir" value="${basedir}/modules/pvm/src/test/resources" />
       <property name="tmp.dir" value="${basedir}/modules/pvm/target/config-tmp" />
       <property name="jpdl" value="exclude" />
+      <property name="identity" value="include" />
     </ant>
     <ant antfile="modules/distro/src/main/resources/config-tool/build.xml" target="create.configuration.files" inheritall="false">
       <property name="config.files.dir" value="${basedir}/modules/jpdl/src/test/resources" />

Modified: jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties	2009-03-12 14:28:45 UTC (rev 4234)
+++ jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties	2009-03-12 14:36:32 UTC (rev 4235)
@@ -1,2 +1,2 @@
 ## index of importer -> set(imports)
-#Wed Mar 11 08:21:14 CET 2009
+#Thu Mar 12 08:40:10 CET 2009

Modified: jbpm4/branches/tbaeyens/modules/distro/pom.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/pom.xml	2009-03-12 14:28:45 UTC (rev 4234)
+++ jbpm4/branches/tbaeyens/modules/distro/pom.xml	2009-03-12 14:36:32 UTC (rev 4235)
@@ -29,43 +29,46 @@
   <dependencies>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-gpd</artifactId>
-      <type>zip</type>
+      <artifactId>jbpm-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-api</artifactId>
+      <artifactId>jbpm-enterprise</artifactId>
+      <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-log</artifactId>
+      <artifactId>jbpm-examples</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-pvm</artifactId>
+      <artifactId>jbpm-enterprise</artifactId>      
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-jpdl</artifactId>
+      <artifactId>jbpm-jboss5</artifactId>
     </dependency>
+     <dependency>
+      <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-jboss5</artifactId>
+      <classifier>config</classifier>
+    </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-enterprise</artifactId>      
+      <artifactId>jbpm-jpdl</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-enterprise</artifactId>
-      <classifier>config</classifier>
+      <artifactId>jbpm-gpd</artifactId>
+      <type>zip</type>
     </dependency>
-
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-examples</artifactId>
+      <artifactId>jbpm-log</artifactId>
     </dependency>
-       
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-test-db</artifactId>
+      <artifactId>jbpm-pvm</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
@@ -73,13 +76,8 @@
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-jboss5</artifactId>
+      <artifactId>jbpm-test-db</artifactId>
     </dependency>
-     <dependency>
-      <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-jboss5</artifactId>
-      <classifier>config</classifier>
-    </dependency>
 
     <dependency>
       <groupId>hsqldb</groupId>
@@ -108,6 +106,11 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.jboss.identity</groupId>
+      <artifactId>idm</artifactId>
+    </dependency>
+
     <!-- Please sort by groupid -->
     <dependency>
       <groupId>org.apache.ant</groupId>

Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml	2009-03-12 14:28:45 UTC (rev 4234)
+++ jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml	2009-03-12 14:36:32 UTC (rev 4235)
@@ -142,8 +142,11 @@
 
     <!-- Run installer build -->
     <echo message="Running IzPack to build the installer..." />
-    <izpack input="${resources.dir}/installer/install-definition.xml" output="${output.dir}/jbpm-installer-${product.version}.jar"
-      installerType="standard" inheritAll="true" basedir="${izpack.temp.dir}" />
+    <izpack input="${resources.dir}/installer/install-definition.xml" 
+            output="${output.dir}/jbpm-installer-${product.version}.jar"
+            installerType="standard" 
+            inheritAll="true" 
+            basedir="${izpack.temp.dir}" />
 
     <!-- Clean working directory -->
     <delete dir="${izpack.temp.dir}" quiet="true" includeemptydirs="true" />

Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.properties
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.properties	2009-03-12 14:28:45 UTC (rev 4234)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.properties	2009-03-12 14:36:32 UTC (rev 4235)
@@ -10,5 +10,5 @@
 connection.type=jdbc
 format.sql=include
 jpdl=include
-identity=include
+identity=exclude
 log.cfg=logging.properties

Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part1.persistence.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part1.persistence.xml	2009-03-12 14:28:45 UTC (rev 4234)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part1.persistence.xml	2009-03-12 14:36:32 UTC (rev 4235)
@@ -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>

Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/examples-hibernate.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/examples-hibernate.cfg.xml	2009-03-12 14:28:45 UTC (rev 4234)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/examples-hibernate.cfg.xml	2009-03-12 14:36:32 UTC (rev 4235)
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-
-<!DOCTYPE hibernate-configuration PUBLIC
-          "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-          "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
-  <session-factory>
-
-    <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
-    <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>    
-    <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property>
-    <property name="hibernate.connection.username">sa</property>
-    <property name="hibernate.connection.password"></property>
-
-    <property name="hibernate.hbm2ddl.auto">create</property>
-
-    <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-
-    <property name="hibernate.format_sql">true</property>
-
-    <mapping resource="jbpm.pvm.typedefs.hbm.xml" />
-    <mapping resource="jbpm.pvm.wire.hbm.xml" />
-    <mapping resource="jbpm.pvm.definition.hbm.xml" />
-    <mapping resource="jbpm.pvm.execution.hbm.xml" />
-    <mapping resource="jbpm.pvm.variable.hbm.xml" />
-    <mapping resource="jbpm.pvm.job.hbm.xml" />
-    <mapping resource="jbpm.pvm.history.hbm.xml" />
-    <mapping resource="jbpm.task.hbm.xml" />
-    <mapping resource="jbpm.jpdl.hbm.xml" />
-
-  </session-factory>
-  
-</hibernate-configuration>
-    
\ No newline at end of file

Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml	2009-03-12 14:28:45 UTC (rev 4234)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml	2009-03-12 14:36:32 UTC (rev 4235)
@@ -177,6 +177,8 @@
         <include name="jbpm-pvm.jar" />
         <include name="jbpm-jpdl.jar" />
         <include name="jbpm-task.jar" />
+        <include name="idm*.jar" />
+        <include name="livetribe-jsr223.jar" />
       </fileset>
 
       <!-- jbpm/jbpm-enterprise.jar -->

Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java	2009-03-12 14:28:45 UTC (rev 4234)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java	2009-03-12 14:36:32 UTC (rev 4235)
@@ -268,8 +268,7 @@
   }
 
   public Deployment deploy() {
-    List<ProcessDefinition> deployedProcessDefinitions = processServiceImpl.deploy(this);
-    processDefinitions.addAll(deployedProcessDefinitions);
+    processDefinitions = processServiceImpl.deploy(this);
     return this;
   }
   

Modified: jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties
===================================================================
--- jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties	2009-03-12 14:28:45 UTC (rev 4234)
+++ jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties	2009-03-12 14:36:32 UTC (rev 4235)
@@ -1,2 +1,2 @@
 ## index of importer -> set(imports)
-#Tue Mar 10 08:33:26 CET 2009
+#Thu Mar 12 08:40:18 CET 2009

Modified: jbpm4/branches/tbaeyens/pom.xml
===================================================================
--- jbpm4/branches/tbaeyens/pom.xml	2009-03-12 14:28:45 UTC (rev 4234)
+++ jbpm4/branches/tbaeyens/pom.xml	2009-03-12 14:36:32 UTC (rev 4235)
@@ -412,8 +412,8 @@
         <module>modules/enterprise</module>
         <module>modules/integration</module>
         <module>modules/devguide</module>
+        <module>modules/userguide</module>
         <module>modules/distro</module>
-        <module>modules/userguide</module>
       </modules>
       <build>
         <plugins>

Modified: jbpm4/branches/tbaeyens/windows/test.distro.bat
===================================================================
--- jbpm4/branches/tbaeyens/windows/test.distro.bat	2009-03-12 14:28:45 UTC (rev 4234)
+++ jbpm4/branches/tbaeyens/windows/test.distro.bat	2009-03-12 14:36:32 UTC (rev 4235)
@@ -4,13 +4,13 @@
 set DOWNLOAD_DIR=C:\Downloads\jboss
 set JBOSS_VERSION=5.0.0.GA
 set CONTAINER=jboss500
-set DATABASE=hsqldb
+set DATABASE=mysql
 
 set JBOSS_DISTRO_FILE=C:\Downloads\jboss\jboss-%JBOSS_VERSION%.zip
 set JBOSS_HOME=C:\Software\jboss-%JBOSS_VERSION%
 
 cd %JBPM4_ROOT%
-mvn -DskipTests -Pdistro -Ddatabase=%DATABASE% -Djbpm.target.container=%CONTAINER% -Djboss.home=%JBOSS_HOME% clean install
+cmd /C mvn -DskipTests -Pdistro -Ddatabase=%DATABASE% -Djbpm.target.container=%CONTAINER% -Djboss.home=%JBOSS_HOME% clean install
 rmdir /S /Q %JBOSS_HOME%
 unzip %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=true -jar modules\distro\target\jbpm-installer-%JBPM_VERSION%.jar modules\distro\target\resources\auto-install-template.xml




More information about the jbpm-commits mailing list