[jbpm-commits] JBoss JBPM SVN: r5811 - in jbpm4/trunk/modules/db: scripts and 1 other directory.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-10-27 07:29:54 -0400 (Tue, 27 Oct 2009)
New Revision: 5811

Modified:
   jbpm4/trunk/modules/db/pom.xml
   jbpm4/trunk/modules/db/scripts/antrun-schema.xml
Log:
JBPM-2598 remove schema generation from distro build

Modified: jbpm4/trunk/modules/db/pom.xml
===================================================================
--- jbpm4/trunk/modules/db/pom.xml	2009-10-27 09:07:09 UTC (rev 5810)
+++ jbpm4/trunk/modules/db/pom.xml	2009-10-27 11:29:54 UTC (rev 5811)
@@ -30,10 +30,40 @@
 
   <profiles>
     <profile>
+      <id>schema</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>create-drop-script</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <tasks>
+                    <property name="project.output.dir" value="${project.build.outputDirectory}" />
+                    <ant antfile="scripts/antrun-schema.xml" target="create-schema" inheritRefs="yes" />
+                  </tasks>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
       <id>upgrade</id>
+      <activation>
+        <property>
+          <name>old.version</name>
+        </property>
+      </activation>
 
       <properties>
-        <old.version>4.1</old.version>
         <old.scripts.directory>${project.build.directory}/create-drop-${old.version}</old.scripts.directory>
       </properties>
 
@@ -55,6 +85,7 @@
 
       <build>
         <plugins>
+
           <plugin>
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
@@ -107,6 +138,7 @@
         </plugins>
       </build>
     </profile>
+    
   </profiles>
 
   <!-- Dependencies -->
@@ -129,27 +161,5 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>create-drop-script</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <property name="project.output.dir" value="${project.build.outputDirectory}" />
-                <ant antfile="scripts/antrun-schema.xml" target="create-schema" inheritRefs="yes" />
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
 
 </project>
\ No newline at end of file

Modified: jbpm4/trunk/modules/db/scripts/antrun-schema.xml
===================================================================
--- jbpm4/trunk/modules/db/scripts/antrun-schema.xml	2009-10-27 09:07:09 UTC (rev 5810)
+++ jbpm4/trunk/modules/db/scripts/antrun-schema.xml	2009-10-27 11:29:54 UTC (rev 5811)
@@ -75,8 +75,8 @@
          If you want to use your local database, specify property upgrade.jdbc.properties.dir in your local build properties -->
     <echo>loading properties from ${user.home}/.jbpm4/build.properties</echo>
     <property file="${user.home}/.jbpm4/build.properties" />
+    <property name="upgrade.jdbc.properties.dir" location="../../qa/jdbc" />
     <echo>upgrade.jdbc.properties.dir: ${upgrade.jdbc.properties.dir}</echo>
-    <property name="upgrade.jdbc.properties.dir" location="../../qa/jdbc" />
     <mkdir dir="${upgrade.scripts.dir}" />
 
     <antcall target="start.hsqldb" inheritrefs="true" />