[jbpm-commits] JBoss JBPM SVN: r4970 - in jbpm4/trunk: modules/distro/src/main/files/jboss and 2 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Jun 2 06:13:17 EDT 2009


Author: jeff.yuchang
Date: 2009-06-02 06:13:17 -0400 (Tue, 02 Jun 2009)
New Revision: 4970

Modified:
   jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/identity/IdentityTest.java
   jbpm4/trunk/pom.xml
   jbpm4/trunk/qa/build.xml
   jbpm4/trunk/qa/hudson-jbpm4-jboss.bat
   jbpm4/trunk/qa/hudson-jbpm4-jboss.sh
Log:
* JBMP-2172, update the ANT script, now invoking the jbossidm/create.jbossidm.schema target.
* Update the version to the SNAPSHOT, I am just publishing a SNAPSHOT for it.
  (Now only left testTaskReminder & testTaskNotification 2 test case failed due to Transaction).



Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml	2009-06-02 05:39:20 UTC (rev 4969)
+++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml	2009-06-02 10:13:17 UTC (rev 4970)
@@ -23,10 +23,11 @@
   <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" />
   <property name="jboss.server.data.dir" value="${jboss.home}/server/${jboss.server.configuration}/data" />
 
-  <property name="jbossidm.version" value="1.0.0.Alpha7" />
-  <property name="jbossidm.home" value="${jboss.parent.dir}/jbossidm-${jbossidm.version}" />
-  <property name="jbossidm.distro.url" value="http://repository.jboss.com/maven2/org/jboss/identity/idm/idm-assembly/${jbossidm.version}/idm-assembly-${jbossidm.version}.zip" />
-  <property name="jbossidm.distro.path" value="${jboss.distro.dir}/idm-assembly-${jbossidm.version}.zip" />
+  <property name="jbossidm.version" value="1.0.0-SNAPSHOT" />
+  <property name="jbossidm.home" value="${jbpm.parent.dir}/jbossidm-${jbossidm.version}" />
+  <!-- for SNAPSHOT temporarily -->
+  <property name="jbossidm.distro.url" value="http://snapshots.jboss.org/maven2/org/jboss/identity/idm/idm-assembly/1.0.0-SNAPSHOT/idm-assembly-1.0.0-20090602.091627-1.zip" />
+  <property name="jbossidm.distro.path" value="${jbpm.parent.dir}/idm-assembly-${jbossidm.version}.zip" />
 
   <!-- JDBC PROPERTIES -->
   <property file="${user.home}/.jbpm4/jdbc/${database}.properties" />
@@ -119,6 +120,28 @@
     <get src="${jbossidm.distro.url}" dest="${jbossidm.distro.path}" />
   </target>
 
+  <!-- #### INSTALL JBOSS IDM ################################################ -->
+  <target name="install.jbossidm" if="jbpm.identity.idm">
+    <antcall target="get.jbossidm" />
+	<unzip src="${jbossidm.distro.path}" dest="${jbossidm.home}/.." />
+  </target>
+
+  <!-- #### DELETE JBOSS IDM ################################################ -->
+  <target name="delete.jbossidm" 
+  	      depends="log.properties"
+              if="jbpm.identity.idm"
+  	      description="deletes jbossidm">
+    <delete dir="${jbossidm.home}" />
+  </target>
+
+  <!-- ### REINSTALL JBOSS IDM ################################################ -->
+  <target name="reinstall.jbossidm"
+          if="jbpm.identity.idm" 
+          description="deletes the previous jboss idm and re-installs jbossidm">
+    <antcall target="delete.jbossidm" />
+    <antcall target="install.jbossidm" />
+  </target>
+
   <!-- ### MAIN TARGET TO INSTALL JBPM INTO JBOSS ######################### -->
   <target name="install.jbpm.into.jboss" 
   	      depends="log.properties" 
@@ -218,8 +241,6 @@
   </target>
 
   <target name="internal.install.idm.into.jboss" if="jbpm.identity.idm">
-       <antcall target="get.jbossidm" />
-  	<unzip src="${jbossidm.distro.path}" dest="${jbossidm.home}/.." />
   	<ant antfile="${jbossidm.home}/jboss/build.xml" target="install.jbossidm.into.jboss">
   		<property name="jboss.home" value="${jboss.home}" />
   		<property name="jboss.server.configuration" value="${jboss.server.configuration}" />

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/identity/IdentityTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/identity/IdentityTest.java	2009-06-02 05:39:20 UTC (rev 4969)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/identity/IdentityTest.java	2009-06-02 10:13:17 UTC (rev 4970)
@@ -112,7 +112,7 @@
     String jbossId = identityService.createGroup("jboss", Group.TYPE_UNIT, redhatGroupId);
     String jbpmId = identityService.createGroup("jbpm", Group.TYPE_UNIT, jbossId);
     
-    identityService.createMembership("joesmoe", jbpmId, "developer");
+    identityService.createMembership("joesmoe", jbpmId, "leader");
     identityService.createMembership("jackblack", jbossId, "manager");
     
     List<Group> groups = identityService.findGroupsByUserAndGroupType("johndoe", Group.TYPE_UNIT);

Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml	2009-06-02 05:39:20 UTC (rev 4969)
+++ jbpm4/trunk/pom.xml	2009-06-02 10:13:17 UTC (rev 4970)
@@ -53,7 +53,7 @@
     <slf4j.version>1.5.2</slf4j.version>
     <hsqldb.version>1.8.0.7</hsqldb.version>
     <izpack.version>4.2.1</izpack.version>
-    <jboss.identity.version>1.0.0.Alpha7</jboss.identity.version>
+    <jboss.identity.version>1.0.0-SNAPSHOT</jboss.identity.version>
     <jboss.j2ee.version>4.2.2.GA</jboss.j2ee.version>
     <jbossesb.version>4.4.0.GA</jbossesb.version>
     <jboss.client.version>5.0.1.GA</jboss.client.version>

Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml	2009-06-02 05:39:20 UTC (rev 4969)
+++ jbpm4/trunk/qa/build.xml	2009-06-02 10:13:17 UTC (rev 4970)
@@ -24,12 +24,16 @@
   <property name="jbpm.distro.path" value="${jbpm.distro.dir}/jbpm-${jbpm.version}.zip" />
   <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" />
 
+  <property name="jbossidm.version" value="1.0.0-SNAPSHOT" />
+  <property name="jbossidm.home" value="${jbpm.parent.dir}/jbossidm-${jbossidm.version}" />
+
   <!-- ### LOG PROPERTIES ################################################# -->
   <target name="log.properties">
     <echo message="database.......... ${database}" />
     <echo message="jbpm.version...... ${jbpm.version}" />
     <echo message="jbpm.home......... ${jbpm.home}" />
     <echo message="jbpm.distro.path.. ${jbpm.distro.path}" />
+	<echo message="jbossidm.home .... ${jbossidm.home}" />
   </target>
   
 	<!-- TARGETS -->
@@ -51,6 +55,11 @@
 		      depends="log.properties, reinstall.jbpm, post.install"
 		      description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema">
     <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" />
+    
+	<!-- initializing the schema into db -->
+	<antcall target="drop.jbossidm.schema" />
+	<antcall target="create.jbossidm.schema" />
+
     <ant antfile="${jbpm.home}/jboss/build.xml" target="install.jbpm.into.jboss" />
     <ant antfile="${jbpm.home}/jboss/build.xml" target="internal.install.jbpm.into.jboss.integrationtestspecifics" />
     <antcall target="enable.jboss.debug" />
@@ -77,15 +86,42 @@
           todir="${jbpm.home}/db/jdbc" 
           overwrite="true" 
           failonerror="false" />
-		<!-- copy the oracle jar as it is not allowed to be part of our distro -->
+	<!-- copy the oracle jar as it is not allowed to be part of our distro -->
     <copy file="../modules/distro/target/oracle/ojdbc14.jar" 
           todir="${jbpm.home}/lib"/>
+   
+    <!-- copy the jdbc configuration and oracle jar to jbossidm  -->
+	<antcall target="copy.jbossidm.jdbc.configuration" />
+
 	</target>
 
+	<condition property="identity.component.idm">
+	  <equals arg1="${identity.component}" arg2="jboss.idm"/>
+	</condition>
+
+	<target name="copy.jbossidm.jdbc.configuration" if="identity.component.idm">
+	  <copy file="../modules/distro/target/oracle/ojdbc14.jar"
+	        todir="${jbossidm.home}/lib" />
+      <copy file="jdbc/${database}.properties"
+	        todir="${jbossidm.home}/db/jdbc"
+			overwrite="true"
+			failonerror="false" />
+	</target>
+
   <target name="integration.testrun.teardown"
   	      description="drops the jbpm schema and stops jboss">
     <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" />
+	<antcall target="drop.jbossidm.schema" />
     <ant antfile="${jbpm.home}/jboss/build.xml" target="stop.jboss" />
   </target>
 
+
+  <target name="drop.jbossidm.schema" if="identity.component.idm">
+    <ant antfile="${jbossidm.home}/db/build.xml" target="drop.jbossidm.schema" />
+  </target>
+
+  <target name="create.jbossidm.schema" if="identity.component.idm">
+    <ant antfile="${jbossidm.home}/db/build.xml" target="create.jbossidm.schema" />
+  </target>
+
 </project>

Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-jboss.bat	2009-06-02 05:39:20 UTC (rev 4969)
+++ jbpm4/trunk/qa/hudson-jbpm4-jboss.bat	2009-06-02 10:13:17 UTC (rev 4970)
@@ -1,6 +1,8 @@
 
 set MAVEN_OPTS=-Xms1024M -Xmx1024M
 
+cmd /C ant -f modules/distro/src/main/files/jboss/build.xml reinstall.jbossidm
+
 cmd /C mvn -U -Pdistro -Pschemadocs clean install
 
 cmd /C ant -f qa/build.xml -Djbpm.debug=true integration.testrun.setup

Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-jboss.sh	2009-06-02 05:39:20 UTC (rev 4969)
+++ jbpm4/trunk/qa/hudson-jbpm4-jboss.sh	2009-06-02 10:13:17 UTC (rev 4970)
@@ -11,6 +11,8 @@
 ant -f modules/distro/src/main/files/jboss/build.xml $ANT_PROPERTIES reinstall.jboss
 ant -f modules/distro/src/main/files/jboss/build.xml $ANT_PROPERTIES stop.jboss
 
+ant -f modules/distro/src/main/files/jboss/build.xml $ANT_PROPERTIES reinstall.jbossidm
+
 mvn -U -Pdistro -Pschemadocs clean install
 
 ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.setup




More information about the jbpm-commits mailing list