[jbosstools-commits] JBoss Tools SVN: r22017 - in branches/modular_build/drools: plugins/org.jboss.tools.flow.ruleflow and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: nickboldt
Date: 2010-05-11 14:44:17 -0400 (Tue, 11 May 2010)
New Revision: 22017

Added:
   branches/modular_build/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml
   branches/modular_build/drools/pom.xml
Modified:
   branches/modular_build/drools/build.xml
Log:
make pom run build.xml instead of build.xml being run before pom

Modified: branches/modular_build/drools/build.xml
===================================================================
--- branches/modular_build/drools/build.xml	2010-05-11 18:37:27 UTC (rev 22016)
+++ branches/modular_build/drools/build.xml	2010-05-11 18:44:17 UTC (rev 22017)
@@ -1,8 +1,27 @@
 <project default="custom.build" name="jbosstools drools build.xml">
 
-	<!-- customize as needed -->
+	<!-- Configuration Start -->
+	<property name="COMPONENT" value="drools" />
 	<property name="drools.zip" value="drools-5.1.0.SNAPSHOT-eclipse-all.zip" />
+	<!-- Configuration Ends -->
 
+	<condition property="WORKINGDIR" value="/home/hudson/static_build_env/jbds/tools/sources/">
+		<available file="/home/hudson/static_build_env/jbds" type="dir" />
+	</condition>
+	<condition property="WORKINGDIR" value="${basedir}/../build" else="${basedir}/../">
+		<available file="${basedir}/../build/${COMPONENT}" type="dir" />
+	</condition>
+
+	<mkdir dir="${WORKINGDIR}" />
+	<echo level="info">WORKINGDIR = ${WORKINGDIR}</echo>
+
+	<condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources">
+		<available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" />
+	</condition>
+	<condition property="build.xml" value="${basedir}/../build/build.xml" else="${basedir}/../build.xml">
+		<available file="${basedir}/../build/build.xml" type="file" />
+	</condition>
+
 	<target name="custom.build"
 	        description="fetch latest drools from their Hudson build + selectively unpack it"
 	        depends="init"
@@ -12,7 +31,7 @@
 		     usetimestamp="true"
 		/>
 		<unzip src="${WORKINGDIR}/${COMPONENT}/${drools.zip}" dest="${WORKINGDIR}/${COMPONENT}" overwrite="true" />
-		
+
 		<ant antfile="${build.xml}" target="unjarPlugins">
 			<property name="COMPONENT" value="${COMPONENT}" />
 		</ant>
@@ -27,8 +46,12 @@
 	</target>
 
 	<target name="init">
-		<property name="build.xml" value="${WORKINGDIR}/build.xml" />
 		<ant antfile="${build.xml}" target="init" />
+		<taskdef resource="net/sf/antcontrib/antlib.xml">
+			<classpath>
+				<pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
+			</classpath>
+		</taskdef>
 	</target>
 
 </project>

Added: branches/modular_build/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml
===================================================================
--- branches/modular_build/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml	                        (rev 0)
+++ branches/modular_build/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml	2010-05-11 18:44:17 UTC (rev 22017)
@@ -0,0 +1,14 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion> 
+	<parent>
+	  <relativePath>../../../parent-pom.xml</relativePath>
+	  <groupId>org.jboss.tools</groupId>
+	  <artifactId>org.jboss.tools.parent.pom</artifactId>
+	  <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<groupId>org.jboss.tools</groupId>
+	<artifactId>org.jboss.tools.flow.ruleflow</artifactId> 
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>

Added: branches/modular_build/drools/pom.xml
===================================================================
--- branches/modular_build/drools/pom.xml	                        (rev 0)
+++ branches/modular_build/drools/pom.xml	2010-05-11 18:44:17 UTC (rev 22017)
@@ -0,0 +1,68 @@
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<relativePath>../parent-pom.xml</relativePath>
+		<groupId>org.jboss.tools</groupId>
+		<artifactId>org.jboss.tools.parent.pom</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<groupId>org.jboss.tools</groupId>
+	<artifactId>drools</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<modules>
+		<module>plugins</module>
+		<module>features</module>
+	</modules>
+
+	<build>
+		<plugins>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.3</version>
+				<executions>
+					<execution>
+						<id>compile</id>
+						<phase>compile</phase>
+						<configuration>
+							<tasks>
+								<ant antfile="build.xml" />
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>commons-net</groupId>
+						<artifactId>commons-net</artifactId>
+						<version>1.4.1</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.ant</groupId>
+						<artifactId>ant-commons-net</artifactId>
+						<version>1.7.1</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.ant</groupId>
+						<artifactId>ant-apache-regexp</artifactId>
+						<version>1.7.1</version>
+					</dependency>
+					<dependency>
+						<groupId>ant-contrib</groupId>
+						<artifactId>ant-contrib</artifactId>
+						<version>1.0b3</version>
+					</dependency>
+				</dependencies>
+
+			</plugin>
+		</plugins>
+	</build>
+</project>
+