[jboss-svn-commits] JBL Code SVN: r23879 - in labs/jbossrules/trunk/drools-eclipse: org.drools.eclipse and 1 other directory.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Nov 14 19:26:29 EST 2008


Author: mark.proctor at jboss.com
Date: 2008-11-14 19:26:29 -0500 (Fri, 14 Nov 2008)
New Revision: 23879

Added:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.feature/
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test.feature/
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test/
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/
Removed:
   labs/jbossrules/trunk/drools-eclipse/allElements.xml
   labs/jbossrules/trunk/drools-eclipse/build.properties
   labs/jbossrules/trunk/drools-eclipse/build.xml
   labs/jbossrules/trunk/drools-eclipse/customTargets.xml
   labs/jbossrules/trunk/drools-eclipse/genericTargets.xml
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.core.feature/
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.core.test.feature/
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.core.test/
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.core/
   labs/jbossrules/trunk/drools-eclipse/package.xml
   labs/jbossrules/trunk/drools-eclipse/setupEclipse.xml
Modified:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/pom.xml
   labs/jbossrules/trunk/drools-eclipse/pom.xml
Log:
getting guvnor sync tool to work

Deleted: labs/jbossrules/trunk/drools-eclipse/allElements.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/allElements.xml	2008-11-14 23:42:17 UTC (rev 23878)
+++ labs/jbossrules/trunk/drools-eclipse/allElements.xml	2008-11-15 00:26:29 UTC (rev 23879)
@@ -1,45 +0,0 @@
-<project name="allElements Delegator">
- 	<!-- ===================================================================== -->
- 	<!-- Run a given ${target} on all elements being built                     -->
- 	<!-- Replace element.id with the id of the top level element being built.    -->
-	<!-- If element.id does not exist in ${buildDirectory}/features/element.id   -->
-	<!-- or ${baseLocation}/features/element.id, then you must provide the       -->
-	<!-- location by setting the property "pluginPath"                           -->
- 	<!-- Add on <ant> task for each top level element being built.             -->
- 	<!-- ===================================================================== -->
- 	<target name="allElementsDelegator">
-    <antcall target="org.drools.eclipse.feature"  />
-    <antcall target="org.drools.eclipse.test-feature"  />
- 	</target>
-
- 	<target name="org.drools.eclipse.feature" if="mavenCompilePhase">
- 		<ant antfile="${genericTargets}" target="${target}">
-	 		<property name="type" value="feature" />
-	 		<property name="id" value="org.drools.eclipse.feature" />
- 		</ant>
- 	</target>
-
- 	<target name="org.drools.eclipse.test-feature" if="mavenTestPhase">
- 		<ant antfile="${genericTargets}" target="${target}">
-	 		<property name="type" value="feature" />
-	 		<property name="id" value="org.drools.eclipse.test-feature" />
- 		</ant>
- 	</target>
-
- 	<!-- ===================================================================== -->
- 	<!-- Targets to assemble the built elements for particular configurations  -->
- 	<!-- These generally call the generated assemble scripts (named in         -->
- 	<!-- ${assembleScriptName}) but may also add pre and post processing       -->
- 	<!-- Add one target for each root element and each configuration           -->
- 	<!-- Replace element.id with the id of the top level element being built   -->
- 	<!-- ===================================================================== -->
- 	<target name="assemble.org.drools.eclipse.feature">
- 		<property name="archiveName" value="${zipFile}"/>
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
- 	</target>
-
- 	<target name="assemble.org.drools.eclipse.test-feature">
- 		<property name="archiveName" value="${testZipFile}"/>
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
- 	</target>
-</project>

Deleted: labs/jbossrules/trunk/drools-eclipse/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/build.properties	2008-11-14 23:42:17 UTC (rev 23878)
+++ labs/jbossrules/trunk/drools-eclipse/build.properties	2008-11-15 00:26:29 UTC (rev 23879)
@@ -1,73 +0,0 @@
-#product=/plugin or feature id/path/to/.product
-runPackager=true
-droolsVersion=5.0.0.SNAPSHOT
-
-# The prefix that will be used in the generated archive.
-archivePrefix=
-# The location underwhich all of the build output will be collected.
-collectingFolder=${archivePrefix}
-
-##sets the zip name
-zipFile=drools-eclipse-${droolsVersion}.zip
-testZipFile=drools-eclipse-test-${droolsVersion}.zip
-
-#Set to true if you want the output to be ready for an update jar (no site.xml generated)
-outputUpdateJars = false
-
-# Timestamp for the build.  Used in naming the build output
-timestamp=007
-
-# Type of build.  Used in naming the build output.  Typically this value is
-# one of I, N, M, S, ...
-buildType=N
-
-# ID of the build.  Used in naming the build output.
-buildId=drools-build
-
-# Label for the build.  Used in naming the build output
-buildLabel=${buildType}.${buildId}
-
-#Where the customised scripts live
-builder=.
-base=${builder}/target
-buildDirectory=${base}/eclipse.build
-baseLocation=${base}/eclipse
-
-
-#Os/Ws/Arch/nl of the eclipse specified by baseLocation
-#baseos=win32
-#basews=win32
-#basearch=x86
-
-eclipseGefURL=http://download.eclipse.org/tools/gef/downloads/drops
-eclipseURL=http://download.eclipse.org/eclipse/downloads/drops
-eclipseBuildRevision=R-3.4-200806172000
-eclipseGefBuildRevision=R200806091334
-eclipseBuildId=3.4
-eclipseGefBuildId=3.4.0
-
-# We don't want any SCM automation
-skipFetch=true
-
-# Specify the output format of the compiler log when eclipse jdt is used
-logExtension=.log
-
-# Whether or not to include debug info in the output jars
-javacDebugInfo=false
-
-# Whether or not to fail the build if there are compiler errors
-javacFailOnError=true
-
-# Enable or disable verbose mode of the compiler
-javacVerbose=true
-
-# Extra arguments for the compiler. These are specific to the java compiler being used.
-#compilerArg=
-
-# Default value for the version of the source code. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacSource in build.properties
-javacSource=1.5
-
-# Default value for the version of the byte code targeted. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacTarget in build.properties.
-javacTarget=1.5
-
-

Deleted: labs/jbossrules/trunk/drools-eclipse/build.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/build.xml	2008-11-14 23:42:17 UTC (rev 23878)
+++ labs/jbossrules/trunk/drools-eclipse/build.xml	2008-11-15 00:26:29 UTC (rev 23879)
@@ -1,126 +0,0 @@
-<project name="Build All Elements" default="main">
-
-<!-- ===================================================================== -->
-<!-- Global properties.  See the build.properties for information on -->
-<!-- the properties which callers can control. -->
-<!-- ===================================================================== -->
-<property name="builder" location="${user.dir}"/>
-<property name="builderDirectory" location="${builder}"/>
-<property name="buildProperties" location="${builder}/build.properties"/>
-<property file="${buildProperties}"/>
-<available property="customTargets" file="${builder}/customTargets.xml" value="${builder}/customTargets.xml"/>
-<property name="customTargets" location="${eclipse.pdebuild.templates}/headless-build/customTargets.xml"/>
-<property name="genericTargets" location="${eclipse.pdebuild.scripts}/genericTargets.xml"/>
-
-<!-- ===================================================================== -->
-<!-- main entry point to setup, fetch, generate, build etc. Use -->
-<!-- the customTargets.xml to modify the build behaviour. -->
-<!-- ===================================================================== -->
-
-<!-- ******* add in the descriptions for each of the top level targets to teh target decl -->
-<target name="main" description="the main build target">	
-  	<antcall target="preBuild" /> 
- 	<antcall target="fetch" />
-	<antcall target="generate" /> 
-	<antcall target="process" /> 
-	<antcall target="assemble" />
-	<antcall target="package" />
-	<antcall target="postBuild" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before starting the build.  Typical setup includes -->
-<!-- fetching the map files and building the directory.  -->
-<!-- ===================================================================== -->
-<target name="preBuild">
-	<mkdir dir="${buildDirectory}" />
-	<ant antfile="${customTargets}" target="preSetup" /> 
-	<ant antfile="${customTargets}" target="getMapFiles" /> 
-	<concat destfile="${buildDirectory}/directory.txt" fixlastline="yes">
-		<fileset dir="${buildDirectory}" includes="maps/**/*.map"/>
-	</concat>
-	<ant antfile="${customTargets}" target="postSetup" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Fetch the elements identified in the customTargets -->
-<!-- ===================================================================== -->
-<target name="fetch" unless="skipFetch">
-	<ant antfile="${customTargets}" target="preFetch"/>
-	<!-- Generates and then execute the fetch scripts for each build element-->
-	<ant antfile="${customTargets}" target="allElements">
-		<property name="target" value="fetchElement" />
-	</ant>
-	
-	<ant antfile="${customTargets}" target="postFetch"/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Generate the build scripts for each element identified in the customTargets -->
-<!-- ===================================================================== -->
-<target name="generate">
-	<ant antfile="${customTargets}" target="preGenerate"/>
-	<!-- Generate the build.xml for each build element-->
-	<ant antfile="${customTargets}" target="allElements">
-		<property name="target" value="generateScript" />
-	</ant>
-	<ant antfile="${customTargets}" target="postGenerate"/>	
-</target>
-
-<!-- ===================================================================== -->
-<!-- Run the build scripts for each element identified in the customTargets -->
-<!-- ===================================================================== -->
-<target name="process">
-	<!-- Run custom tasks before processing, i.e. creating source build zip files -->
-	<ant antfile="${customTargets}" target="preProcess" />
-
-	<!-- Process all of the build elements-->
-	<ant antfile="${customTargets}" target="allElements">
-		<property name="target" value="processElement" />
-	</ant>
-
-	<!-- Run custom tasks after compiling, i.e. reporting compile errors -->
-	<ant antfile="${customTargets}" target="postProcess" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Assemble the build elements into final distributions -->
-<!-- ===================================================================== -->
-<target name="assemble">
-	<ant antfile="${customTargets}" target="preAssemble"/>
-	<ant antfile="${customTargets}" target="allElements">
-		<property name="target" value="assembleElement"/>
-	</ant>
-	<ant antfile="${customTargets}" target="postAssemble"/>	
-</target>
-
-<!-- ===================================================================== -->
-<!-- Package the build elements into final distributions -->
-<!-- ===================================================================== -->
-<target name="package" if="runPackager">
-	<ant antfile="${customTargets}" target="prePackage"/>
-	<ant antfile="${customTargets}" target="allElements">
-		<property name="target" value="packageElement"/>
-	</ant>
-	<ant antfile="${customTargets}" target="postPackage"/>	
-</target>
-
-<!-- ===================================================================== -->
-<!-- Do any steps required after the build (e.g., posting, testing, ...) -->
-<!-- ===================================================================== -->
-<target name="postBuild">
-	<ant antfile="${customTargets}" target="postBuild" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Clean the build elements.  This target is here as an entry -->
-<!-- point to the customTargets.  It is not called directly in the normal -->
-<!-- course of events. -->
-<!-- ===================================================================== -->
-<target name="clean">
-  <ant antfile="${customTargets}" target="allElements">
-     <property name="target" value="cleanElement"/>
-  </ant>
-</target>
-
-</project>

Deleted: labs/jbossrules/trunk/drools-eclipse/customTargets.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/customTargets.xml	2008-11-14 23:42:17 UTC (rev 23878)
+++ labs/jbossrules/trunk/drools-eclipse/customTargets.xml	2008-11-15 00:26:29 UTC (rev 23879)
@@ -1,198 +0,0 @@
-<project name="Build specific targets and properties" default="noDefault">
-	<!-- ===================================================================== -->
-	<!-- Run a given ${target} on all elements being built -->
-	<!-- Add on <ant> task for each top level element being built. -->
-	<!-- ===================================================================== -->
-	<property name="allElementsFile" value="${builder}/allElements.xml"/>
-	<import file="${allElementsFile}" />
-	<target name="allElements">
-		<antcall target="allElementsDelegator" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- ===================================================================== -->
-	<!-- Check out map files from correct repository -->
-	<!-- Replace values for mapsCheckoutTag as desired. -->
-	<!-- ===================================================================== -->
-	<target name="getMapFiles" depends="checkLocalMaps" unless="skipMaps">
-		<property name="mapsCheckoutTag" value="HEAD" />
-		<cvs cvsRoot="${mapsRepo}" package="${mapsRoot}" dest="${buildDirectory}/maps" tag="${mapsCheckoutTag}" />
-	</target>
-
-	<target name="checkLocalMaps">
-		<available property="skipMaps" file="${buildDirectory}/maps" />
-	</target>
-
-	<target name="tagMapFiles" if="tagMaps">
-		<cvs dest="${buildDirectory}/maps/${mapsRoot}" command="tag ${mapsTagTag}" />
-	</target>
-
-	<!-- ===================================================================== -->
-
-	<target name="clean" unless="noclean">
-		<antcall target="allElements">
-			<param name="target" value="cleanElement" />
-		</antcall>
-	</target>
-
-	<target name="gatherLogs">
-		<mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
-		<antcall target="allElements">
-			<param name="target" value="gatherLogs" />
-		</antcall>
-		<unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
-			<fileset dir="${buildDirectory}/features">
-				<include name="**/*.log.zip" />
-			</fileset>
-		</unzip>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before setup -->
-	<!-- ===================================================================== -->
-	<target name="preSetup">
-	  <echo>preSetup</echo>	  
-    <!--cleanup -->
-    <delete failonerror="false" file="${base}/eclipse/org.drools.eclipse*.xml" />
-    <delete failonerror="false" dir="${base}/eclipse/test-workspace"/>
-    
-    <delete failonerror="false"  dir="${base}/eclipse/features/org.drools.eclipse.feature_${droolsVersion}"/>
-    <delete failonerror="false" dir="${base}/eclipse/features/org.drools.eclipse.test-feature_${droolsVersion}"/>
-    
-    <delete failonerror="false" file="${base}/eclipse/plugins/org.drools.eclipse_${droolsVersion}.jar"/>
-    <delete failonerror="false" dir="${base}/eclipse/plugins/org.drools.eclipse.test_${droolsVersion}"/>            
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do after setup but before starting the build proper -->
-	<!-- ===================================================================== -->
-	<target name="postSetup">		
-		<mkdir dir="${buildDirectory}/features"/>
-		<mkdir dir="${buildDirectory}/plugins"/>
-		
-		<antcall target="compilePostSetup" />
-		<antcall target="testPostSetup" />
-	</target>
-	
-	<target name="compilePostSetup" if="mavenCompilePhase">
-		<copy todir="${buildDirectory}/features/org.drools.eclipse.feature">
-			<fileset dir="${builder}/drools-eclipse-feature"/>
-		</copy>
-
-		<copy todir="${buildDirectory}/plugins/org.drools.eclipse">
-				<fileset dir="${builder}/drools-eclipse-plugin"/>
-		</copy>		
-	</target>
-
-	<target name="testPostSetup" if="mavenTestPhase">
-		
-		<copy todir="${buildDirectory}/features/org.drools.eclipse.test-feature">
-			<fileset dir="${builder}/drools-eclipse-test-feature"/>
-		</copy>
-
-		<copy todir="${buildDirectory}/plugins/org.drools.eclipse.test">
-				<fileset dir="${builder}/drools-eclipse-test"/>
-		</copy>		
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="preFetch">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="postFetch">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before generating the build scripts. -->
-	<!-- ===================================================================== -->
-	<target name="preGenerate">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after generating the build scripts. -->
-	<!-- ===================================================================== -->
-	<target name="postGenerate">
-		<antcall target="clean" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="preProcess">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="postProcess">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running assemble. -->
-	<!-- ===================================================================== -->
-	<target name="preAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after  running assemble. -->
-	<!-- ===================================================================== -->
-	<target name="postAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running package. -->
-	<!-- ===================================================================== -->
-	<target name="prePackage">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after  running package. -->
-	<!-- ===================================================================== -->
-	<target name="postPackage" if="mavenCompilePhase">
-	    <copy file="${buildDirectory}/${buildLabel}/${zipFile}" tofile="${base}/${zipFile}" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the build is done. -->
-	<!-- ===================================================================== -->
-	<target name="postBuild">
-		<antcall target="gatherLogs" />
-		<antcall target="test" />
-	</target>	
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do to test the build results -->
-	<!-- ===================================================================== -->
-  <target name="test" if="mavenTestPhase">  
-    <unzip src="${buildDirectory}/${buildLabel}/${zipFile}"
-           dest="${base}/eclipse"/>
-    <unzip src="${buildDirectory}/${buildLabel}/${testZipFile}" 
-           dest="${base}/eclipse"/>    
-
-
-    <ant antfile="${base}/eclipse/plugins/org.drools.eclipse.test_${droolsVersion}/test.xml">        
-      <property name="os" value="${baseos}" />
-      <property name="ws" value="${basews}" />
-      <property name="arch" value="${basearch}" />
-    </ant>
-  </target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do to publish the build results -->
-	<!-- ===================================================================== -->
-	<target name="publish">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="You must specify a target when invoking this file" />
-	</target>
-
-</project>

Deleted: labs/jbossrules/trunk/drools-eclipse/genericTargets.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/genericTargets.xml	2008-11-14 23:42:17 UTC (rev 23878)
+++ labs/jbossrules/trunk/drools-eclipse/genericTargets.xml	2008-11-15 00:26:29 UTC (rev 23879)
@@ -1,175 +0,0 @@
-<project name="Generic Build Targets" default="noDefault">
-
-<!-- Properties that must be passed to this script:
-	buildDirectory
-	id
-	type
-	ignoreTagInfo
-	recursiveGeneration
-	workingDirectory
-	configInfo
--->
-
-<!-- ===================================================================== -->
-<!-- Setup default values -->
-<!--   configs : by default build a platform-independent configuration -->
-<!--   fetchTag : by default use the CVS tags as spec'd in directory.txt -->
-<!-- ===================================================================== -->
-<property name="configs" value="*,*,*"/>
-<property name="fetchTag" value=""/>
-<property name="buildingOSGi" value="true"/>
-<property name="generateJnlp" value="false"/>
-<property name="signJars" value="false"/>
-<property name="generateFeatureVersionSuffix" value="false" />
-<property name="generateVersionsLists" value="true" />
-<property name="groupConfigurations" value="false"/>
-<property name="pluginPath" value=""/>
-<property name="filteredDependencyCheck" value="false"/>
-
-<!-- ===================================================================== -->
-<!-- Fetch a single element (feature, plugin, fragment) -->
-<!-- ===================================================================== -->
-<target name="fetchElement" description="Checking out source from repository..." depends="init">
-	<mkdir dir="${buildDirectory}/features"/>
-	<mkdir dir="${buildDirectory}/plugins"/>
-	<eclipse.fetch
-		elements="${type}@${id}"
-		buildDirectory="${buildDirectory}"
-		directory="${buildDirectory}/directory.txt"
-		fetchTag="${fetchTag}"
-		configInfo="${configs}"
-		baseLocation="${baseLocation}"
-	/>
-	
-	<!-- Run generated fetch script -->
-	<ant antfile="${buildDirectory}/fetch_${id}.xml">
-		<!-- ************  should not have to spec these  *************** -->
-		<property name="featureOnly" value="true"/>
-		<property name="featureAndPlugins" value="true"/>
-		<property name="featuresRecursively" value="true"/>
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Clean previously built elements -->
-<!-- ===================================================================== -->
-<target name="cleanElement" description="Scrubbing features and plugins of old jars..." depends="init">
-<echo message="${elementPath}"/>
-	<ant antfile="build.xml" dir="${elementPath}" target="clean"/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Generate a build.xml file for an element -->
-<!-- ===================================================================== -->
-<target name="generateScript" description="Generating build scripts..." depends="init">
-	<eclipse.buildScript 
-		elements="${type}@${id}" 
-		buildDirectory="${buildDirectory}"
-		configInfo="${configs}"
-		baseLocation="${baseLocation}"
-		buildingOSGi="${buildingOSGi}"
-		outputUpdateJars="${outputUpdateJars}"
-		archivesFormat="${archivesFormat}"
-		product="${product}"
-		forceContextQualifier="${forceContextQualifier}"
-		generateJnlp="${generateJnlp}"
-		signJars="${signJars}"
-		generateFeatureVersionSuffix="${generateFeatureVersionSuffix}"
-		significantVersionDigits="${significantVersionDigits}"
-		generatedVersionLength="${generatedVersionLength}"
-		generateVersionsLists="${generateVersionsLists}"
-		groupConfiguration="${groupConfigurations}"
-		pluginPath="${pluginPath}"
-		filteredDependencyCheck="${filteredDependencyCheck}"
-		platformProperties="${platformProperties}"
-	/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Run build.xml for a single element-->
-<!-- ===================================================================== -->
-<target name="processElement" description="Processing build scripts..." depends="init">
-	<ant antfile="build.xml" dir="${elementPath}" target="build.jars">
-		<property name="target" value="build.jars"/>
-	</ant>
-</target>
-
-<!-- **********************
-1) the gather targets do more than just gather.  These are packaging targets.
-We need to continue ot separate the two concepts (gather and package) as 
-the packaging is different if we wanted to create an update site packaging
-(for example).  The gathers are commented out for now as the new generated
-scripts do not seem to have them.
-
-2) do we really need the ws and os properties?  In all cases?  Do they have to be 
-set here?
--->
-
-<!-- ===================================================================== -->
-<!-- Gather items listed in bin.includes -->
-<!-- ===================================================================== -->
-<target name="gatherBinaries" description="Gathering binary distribution..." depends="init">
-	<!-- ant antfile="build.xml" dir="${elementPath}" target="gather.bin.parts"/ -->
-	<ant antfile="build.xml" dir="${elementPath}" target="zip.distribution">
-		<property name="os" value="${os}" />
-		<property name="ws" value="${ws}" />	
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Gather source for a build element -->
-<!-- ===================================================================== -->
-<target name="gatherSources" description="Gathering source distribution..." depends="init">
-	<!--suspect:  this call is required to create the *.src.zip inside each plugin-->
-	<ant antfile="build.xml" dir="${elementPath}" target="build.sources">
-		<property name="os" value="${os}" />
-		<property name="ws" value="${ws}" />	
-	</ant>
-	<ant antfile="build.xml" dir="${elementPath}" target="zip.sources">
-		<property name="os" value="${os}" />
-		<property name="ws" value="${ws}" />	
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Gather log files for an element -->
-<!-- Suspect: We just unzip these right away -->
-<!-- ===================================================================== -->
-<target name="gatherLogs" description="Gathering build logs..." depends="init">
-	<ant antfile="build.xml" dir="${elementPath}" target="zip.logs" >
-		<property name="buildDirectory" value="${buildDirectory}" />
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Default target                                                        -->
-<!-- ===================================================================== -->
-<target name="noDefault">
-	<echo message="This file must be called with explicit targets" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Assemble one build element -->
-<!-- ===================================================================== -->
-<target name="assembleElement" description="Assembling the build..." depends="init">
-	<ant antfile="assemble.${id}.all.xml" dir="${buildDirectory}"/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Package one build element -->
-<!-- ===================================================================== -->
-<target name="packageElement" description="Packaging the build..." depends="init">
-	<ant antfile="package.${id}.all.xml" dir="${buildDirectory}"/>
-</target>
-	
-<!-- ===================================================================== -->
-<!-- Miscellaneous helper targets -->
-<!-- ===================================================================== -->
-<target name="init">
-	<condition property="elementPath" value="${buildDirectory}/plugins/${id}">
-		<equals arg1="${type}" arg2="fragment" />
-	</condition>
-	<property name="elementPath" value="${buildDirectory}/${type}s/${id}" />
-</target>
-
-</project>

Copied: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse (from rev 23878, labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.core)

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.core/pom.xml	2008-11-14 23:42:17 UTC (rev 23878)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/pom.xml	2008-11-15 00:26:29 UTC (rev 23879)
@@ -27,8 +27,8 @@
                 <delete>
                   <fileset dir="lib" includes="**/*.jar" excludes="**/.svn" />                 
                 </delete>
-                <delete dir="drools-eclipse-plugin/help/shared" />     
-                <delete dir="drools-eclipse-plugin/help/eclipse" />     
+                <delete dir="help/shared" />     
+                <delete dir="help/eclipse" />     
              </tasks>
            </configuration>
            <goals>
@@ -73,7 +73,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <outputDirectory>drools-eclipse-plugin/lib</outputDirectory>
+              <outputDirectory>lib</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
               <overWriteIfNewer>true</overWriteIfNewer>

Copied: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.feature (from rev 23878, labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.core.feature)

Copied: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test (from rev 23878, labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.core.test)

Copied: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test.feature (from rev 23878, labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.core.test.feature)

Deleted: labs/jbossrules/trunk/drools-eclipse/package.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/package.xml	2008-11-14 23:42:17 UTC (rev 23878)
+++ labs/jbossrules/trunk/drools-eclipse/package.xml	2008-11-15 00:26:29 UTC (rev 23879)
@@ -1,88 +0,0 @@
-<project name="packager" default="main" basedir=".">
-	<target name="init">
-		<mkdir dir="${workingDirectory}"/>
-		<mkdir dir="${downloadDirectory}"/>
-		<mkdir dir="${tempDirectory}"/>
-	</target>
-
-	<target name="retrieveMapFiles" unless="skipMaps">
-		<available property="mapsFetched" file="${workingDirectory}/all.maps"/>
-		<ant antfile="${customTargets}" target="getMapFiles" />
-		<concat destfile="${workingDirectory}/all.maps">
-			<fileset dir="${downloadDirectory}" includes="**/*.map"/>
-		</concat>
-	</target>
-
-	<!-- take the content of all.maps, retrieve the files according to the filtering options (config, content), 
-	and generate a directory.txt for the rest of the process using config as a key, and containing the name of the zip and the directory -->
-	<target name="retrieveFiles" unless="skipFetch">
-		<eclipse.fetchFilesGenerator map="${workingDirectory}/all.maps"
-									workingDirectory="${workingDirectory}"
-									configInfo="${config}"
-									contentFilter="${contentFilter}"
-									componentFilter="${componentFilter}"/>
-		<ant antfile="fetch.xml" dir="${workingDirectory}" />
-	</target>
-
-	<!-- Process the directory.txt to create unzipper.xml, and run unzipper.xml-->
-	<target name="prepareResources" unless="skipUnzip">
-		<eclipse.unzipperBuilder 	workingDirectory="${workingDirectory}" 
-											configInfo="${config}"
-											packagePropertyFile="${packagingPropertyFile}"/>
-		<ant antfile="${workingDirectory}/unzipper.xml"/>
-	</target>
-
-	<!-- Generate an assemble script (assemble.xml) for the given features -->
-	<target name="generateAssembleScripts">
-		<echo message="${target}"/>
-		<eclipse.assembler featureList="${featureList}" 
-									workingDirectory="${workingDirectory}" 
-									configInfo="${config}" 
-									baseLocation="${target}" 
-									packagePropertyFile="${packagingPropertyFile}" 
-									deltaPack="${deltaPack}"
-									archivesFormat="${archivesFormat}"
-									filteredDependencyCheck="${filteredDependencyCheck}"
-									normalize="${normalizeWhilePackaging}"/>
-	</target>
-
-	<!-- Call the assemble.xml script -->
-	<target name="callAssembleScripts">
-		<ant antfile="package.all.xml" dir="${workingDirectory}"/>
-	</target>
-
-	<target name="main" description="Start the packager for a given config">
-		<property file="${packagingInfo}/packager.properties" />
-		<property name="customTargets" location="${packagingInfo}/customTargets.xml" />
-		<property name="packagingPropertyFile" location="${packagingInfo}/${packagingProperties}" />
-		
-		<condition property="skipMaps" value="true">
-			<isset property="prefilledTarget" />
-		</condition>
-		<condition property="skipFetch" value="true">
-			<isset property="prefilledTarget" />
-		</condition>
-		<condition property="skipUnzip" value="true">
-			<isset property="prefilledTarget" />
-		</condition>
-		
-		<!-- Compatibility -->
-		<property name="filteredDependencyCheck" value="false"/>
-		<condition property="skipMaps" value="true">
-			<isset property="localMaps"/>
-		</condition>
-		<condition property="target" value="${tempDirectory}/${featurePaths}">
-			<isset property="featurePaths"/>
-		</condition>
-		<property name="normalizeWhilePackaging" value="true"/>
-		
-		<!-- End of compatibility -->
-			
-		<antcall target="init" />
-		<antcall target="retrieveMapFiles"/>
-		<antcall target="retrieveFiles"/>
-		<antcall target="prepareResources"/>
-		<antcall target="generateAssembleScripts"/>
-		<antcall target="callAssembleScripts"/>
-	</target>
-</project>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-eclipse/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/pom.xml	2008-11-14 23:42:17 UTC (rev 23878)
+++ labs/jbossrules/trunk/drools-eclipse/pom.xml	2008-11-15 00:26:29 UTC (rev 23879)
@@ -14,7 +14,7 @@
   <name>Drools :: Eclipse-Plugin</name>
   
   <modules>
-      <module>drools-eclipse-plugin</module>
+      <module>org.drools.eclipse.core</module>
       <module>drools-eclipse-build</module>
   </modules>
 

Deleted: labs/jbossrules/trunk/drools-eclipse/setupEclipse.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/setupEclipse.xml	2008-11-14 23:42:17 UTC (rev 23878)
+++ labs/jbossrules/trunk/drools-eclipse/setupEclipse.xml	2008-11-15 00:26:29 UTC (rev 23879)
@@ -1,125 +0,0 @@
-<project name="Setup Local  Eclipse" default="setupLocalEclipse">   
-  
-  <property file="build.properties"/>
-
-  <property name="localEclipseDrop" value="${basedir}/local-eclipse-drop-mirror" />   
- 
-  <!-- set the OS name, make sure each condition is mutally exclusive -->
-	<condition property="download.type" value="win32">
-		<os family="windows" />
-	</condition>	
-			
-	<condition property="download.type" value="macosx-carbon">
-		<and>
-			<os family="mac" />
-			<os family="unix" />
-		</and>
-	</condition>
-	
-	<condition property="download.type" value="linux-gtk">
-		<and>
-			<not>
-				<os family="mac" />
-			</not>
-			<os family="unix" />
-		</and>
-	</condition>		
-	
-	<condition property="download.extension" value="zip">
-		<os family="windows" />
-	</condition>		
-	
-	<condition property="download.extension" value="tar.gz">
-		<or>
-			<os family="mac" />
-			<os family="unix" />
-		</or>
-	</condition>	
-		  		        
-   <condition property="expandTypeZip" value="true">
-       <equals arg1="${download.extension}" arg2="zip" />
-   </condition>   
-
-   <condition property="expandTypeTarGz" value="true">
-       <equals arg1="${download.extension}" arg2="tar.gz" />
-   </condition>   
-   
-  <!-- make sure the directory exists -->   
-  <target name="makeLocalEclipseDropDir">
-    <mkdir dir="${localEclipseDrop}" />    
-  </target>   
-   
-  <target name="getEclipseJar" depends="checkEclipseJar" unless="skipGetEclipseJar">
-    <mkdir dir="${localEclipseDrop}/eclipse/${eclipseBuildRevision}" />    
-    
-    <get usetimestamp="true" src="${eclipseURL}/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.${download.extension}" 
-         dest="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.${download.extension}" /> 
-  </target>  
-  
-  <target name="getTestJar" depends="checkTestJar" unless="skipGetTestJar">
-    <mkdir dir="${localEclipseDrop}/eclipse/${eclipseBuildRevision}" />    
-    <get usetimestamp="true" src="${eclipseURL}/${eclipseBuildRevision}/eclipse-test-framework-${eclipseBuildId}.zip"
-         dest="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-test-framework-${eclipseBuildId}.zip"/>    
-  </target>
-
-  <target name="getGefJar" depends="checkGefJar" unless="skipGetGefJar">
-    <mkdir dir="${localEclipseDrop}/tools/gef/${eclipseGefBuildRevision}" />    
-    <get usetimestamp="true" src="${eclipseGefURL}/${eclipseGefBuildId}/${eclipseGefBuildRevision}/GEF-runtime-${eclipseGefBuildId}.zip" 
-         dest="${localEclipseDrop}/tools/gef/${eclipseGefBuildRevision}/GEF-runtime-${eclipseGefBuildId}.zip" />
-  </target>      
-
-	<target name="checkEclipseJar">	
-		<available file="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.zip" property="skipGetEclipseJar" />
-	</target>
-	
-	<target name="checkTestJar">	
-		<available file="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-test-framework-${eclipseBuildId}.zip" property="skipGetTestJar" />
-	</target>	
-		
-	<target name="checkGefJar">	
-		<available file="${localEclipseDrop}/tools/gef/${eclipseGefBuildRevision}/GEF-runtime-${eclipseGefBuildId}.zip" property="skipGetGefJar" />
-	</target>	  
-
-  <target name="setupLocalEclipseDrop"  depends="checkEclipseDir" unless="skipUnzipEclipseJars">
-    <antcall target="makeLocalEclipseDropDir" />
-    <antcall target="getEclipseJar" />
-    <antcall target="getTestJar" />    
-    <antcall target="getGefJar" />      
-  </target>
-  
-  <target name="expandEclipseJars">   
-    <antcall target="unzipEclipse" />	
-    <antcall target="untarEclipse" />
-    
-    <unzip dest="${base}" overwrite="true"
-           src="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-test-framework-${eclipseBuildId}.zip" />   				
-				
-	<unzip dest="${base}" overwrite="true" 
-	       src="${localEclipseDrop}/tools/gef/${eclipseGefBuildRevision}/GEF-runtime-${eclipseGefBuildId}.zip" />				         
-  </target>    
-  
-  <target name="unzipEclipse" if="expandTypeZip">
-  	<unzip dest="${base}" overwrite="true" 
-  	       src="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.${download.extension}" />  
-  </target>
-
-  <target name="untarEclipse" if="expandTypeTarGz">
-	<gunzip src="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.tar.gz"/>
-	<untar dest="${base}" src="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.tar" />
-  </target>
-  
-  <target name="checkEclipseDir">
-    <available file="${base}/eclipse" property="skipUnzipEclipseJars" />
-  </target>
-    
-  <target name="setupLocalEclipse" depends="checkLocalEclipse" unless="skipSetupLocalEcipse">  
-    <echo>local eclipse drop mirror - ${localEclipseDrop}</echo>
-    <antcall target="setupLocalEclipseDrop" />
-    <antcall target="expandEclipseJars" />
-  </target>	
-  
-  <target name="checkLocalEclipse">
-      <available type="dir" file="${base}/eclipse" property="skipSetupLocalEcipse" />
-  </target>
-  
-</project>




More information about the jboss-svn-commits mailing list