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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed May 2 22:50:08 EDT 2007


Author: mark.proctor at jboss.com
Date: 2007-05-02 22:50:08 -0400 (Wed, 02 May 2007)
New Revision: 11609

Modified:
   labs/jbossrules/trunk/README.txt
   labs/jbossrules/trunk/README_DEPENDENCIES.txt
   labs/jbossrules/trunk/drools-eclipse/build.properties
   labs/jbossrules/trunk/drools-eclipse/customTargets.xml
   labs/jbossrules/trunk/drools-eclipse/pom.xml
   labs/jbossrules/trunk/pom.xml
   labs/jbossrules/trunk/src/main/assembly/bin.xml
   labs/jbossrules/trunk/src/main/assembly/eclipse.xml
   labs/jbossrules/trunk/src/main/assembly/src.xml
Log:
-fixed the assemblers
-fixed readmes

Modified: labs/jbossrules/trunk/README.txt
===================================================================
--- labs/jbossrules/trunk/README.txt	2007-05-03 02:23:07 UTC (rev 11608)
+++ labs/jbossrules/trunk/README.txt	2007-05-03 02:50:08 UTC (rev 11609)
@@ -1,4 +1,13 @@
 Welcome to Drools
 -----------------
 
-Type "ant help", from the command line, for a list of a build commands.
\ No newline at end of file
+Drools uses maven to build the system. There are two profiles available which enable the associated modules "documentation" and "eclipse"; this enables quicker building of the core modules for developers. The eclipse profile will download eclipse into the drools-eclipse folder, which is over 100MB download, however this only needs to be done once; if you wish you can move that eclipse download into another location and specify it with -DlocalEclipseDrop=/folder/jboss-rules/local-eclipse-drop-mirror. 
+
+The following builds all the jars, the documentation and the eclipse zip with a local folder specified to avoid downloading eclipse
+mvn -Declipse=true -Ddocumentation=true clean install -DlocalEclipseDrop=/folder/jboss-rules/local-eclipse-drop-mirror
+
+You can produce distribution builds, which puts everything into zips, as follows:
+mvn -Declipse=true -Ddocumentation=true clean install -DlocalEclipseDrop=/folder/jboss-rules/local-eclipse-drop-mirror
+mvn -Ddocumentation -Declipse -Dmaven.test.skip package javadoc:javadoc assembly:assembly -DlocalEclipseDrop=/folder/jboss-rules/local-eclipse-drop-mirror
+
+Note that install must be done first as javadoc:javadoc won't work unless the jars are in the local maven repo, but the tests can be skipped on the second run.
\ No newline at end of file

Modified: labs/jbossrules/trunk/README_DEPENDENCIES.txt
===================================================================
--- labs/jbossrules/trunk/README_DEPENDENCIES.txt	2007-05-03 02:23:07 UTC (rev 11608)
+++ labs/jbossrules/trunk/README_DEPENDENCIES.txt	2007-05-03 02:50:08 UTC (rev 11609)
@@ -4,8 +4,9 @@
 Runtime assumes that you are "compiling" rules using drools-compiler.
 
     * drools-core - the rule engine itself.
+    * mvel14-1.2beta16
     * optional packages:
-          o xpp3, xstream - if you are using the file based audit feature
+          o xpp3-1.1.3.4.O, xstream-1.1.3 - if you are using the file based audit feature
 
 Note you can use the drools-core stand-alone if you are compiling "outside" your runtime application, and deploying serialized Package or RuleBase? objects.
 
@@ -14,35 +15,31 @@
 
     * drools-core
     * drools-compiler - the rule compiler itself.
-    * antlr3 - only if you are using native DRL. if only using XML, you can skip this.
-    * xerces, xml-apis - only if you are using XML rules, if DRL only, can skip this.
-    * commons-jci-core
-          o This also requires only one pair out of:
-                + commons-jci-eclipse, core-3.2 - for eclipse JDT to compile the java semantics (this is default)
-                + commons-jci-janino, janino - for janino. To use this option, set -Ddrools.compiler=JANINO or use PackageBuilderConfiguration? class.
-    * commons-logging - used by various dependencies.
-    * commons-lang - used for string manipulation in various dependencies.
-    * stringtemplate, anlr-2.7.6 - used in generating semantic code.
+    * antlr3-3.0b7
+    * xerces-2.4.0, xml-apis-1.0.b2 - only if you are using XML rules, if DRL only, can skip this.
+    * eclipse-jdt-core-3.2.1.v_677_R32x - only if you want to compile with eclipse
+    * janino-2.5.6 - only if you want to compile with janino
 
 JSR-94
-This is the standard api for java rules (javax.rules). This depends on COMPILER.
+This is the standard api for java rules (javax.rules).
 
+    * drools-core
+    * drools-compiler
     * drools-jsr94 - the implementation of the standard
     * jsr94-1.1 - the standard API for javax.rules.
 
 DECISION TABLES
 Decision tables use spreadsheets to generate rules.
 
+    * drools-core
     * drools-compiler - required as rules are generated and compiled
     * drools-decisiontables - contains the spreadsheet compiler for both XLS and CSV
-    * jxl (jexcelapi) - for parsing Excel spreadsheets.
+    * jxl-2.4.2 (jexcelapi) - for parsing Excel spreadsheets.
 
 The most common use case is for COMPILER - this allows rules to be loaded from their source form, 
 and includes the runtime engine of course. 
 For example, if you wanted to be able to load rules from a drl source you would need: drools-core and the COMPILER jars mentioned above 
-(not xerces, and not xml-apis), and commons-jar-eclipse, core-3.2. 
-You will only need optional core jars if you are using those features.
+(not xerces, and not xml-apis). You will only need optional core jars if you are using those features.
 
 When building from source, the dependencies are managed by maven. 
-In each module, there is a pom.xml file that lists the exact dependencies and exact version numbers. 
-Even if you use ant to build, the dependencies will be downloaded for you based on those pom.xml files. 
+In each module, there is a pom.xml file that lists the exact dependencies and exact version numbers.

Modified: labs/jbossrules/trunk/drools-eclipse/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/build.properties	2007-05-03 02:23:07 UTC (rev 11608)
+++ labs/jbossrules/trunk/drools-eclipse/build.properties	2007-05-03 02:50:08 UTC (rev 11609)
@@ -1,6 +1,6 @@
 #product=/plugin or feature id/path/to/.product
 runPackager=true
-jbossRulesVersion=4.0.0.SNAPSHOT
+droolsVersion=4.0.0.SNAPSHOT
 
 # The prefix that will be used in the generated archive.
 archivePrefix=
@@ -8,8 +8,8 @@
 collectingFolder=${archivePrefix}
 
 ##sets the zip name
-zipFile=jbossrules-eclipse-${jbossRulesVersion}.zip
-testZipFile=jbossrules-eclipse-test-${jbossRulesVersion}.zip
+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
@@ -22,7 +22,7 @@
 buildType=N
 
 # ID of the build.  Used in naming the build output.
-buildId=jbossrules-build
+buildId=drools-build
 
 # Label for the build.  Used in naming the build output
 buildLabel=${buildType}.${buildId}

Modified: labs/jbossrules/trunk/drools-eclipse/customTargets.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/customTargets.xml	2007-05-03 02:23:07 UTC (rev 11608)
+++ labs/jbossrules/trunk/drools-eclipse/customTargets.xml	2007-05-03 02:50:08 UTC (rev 11609)
@@ -56,11 +56,11 @@
     <delete file="${base}/eclipse/org.drools.eclipse*.xml" />
     <delete dir="${base}/eclipse/test-workspace"/>
     
-    <delete dir="${base}/eclipse/features/org.drools.eclipse.feature_${jbossRulesVersion}"/>
-    <delete dir="${base}/eclipse/features/org.drools.eclipse.test-feature_${jbossRulesVersion}"/>
+    <delete dir="${base}/eclipse/features/org.drools.eclipse.feature_${droolsVersion}"/>
+    <delete dir="${base}/eclipse/features/org.drools.eclipse.test-feature_${droolsVersion}"/>
     
-    <delete file="${base}/eclipse/plugins/org.drools.eclipse_${jbossRulesVersion}.jar"/>
-    <delete dir="${base}/eclipse/plugins/org.drools.eclipse.test_${jbossRulesVersion}"/>            
+    <delete file="${base}/eclipse/plugins/org.drools.eclipse_${droolsVersion}.jar"/>
+    <delete dir="${base}/eclipse/plugins/org.drools.eclipse.test_${droolsVersion}"/>            
 	</target>
 
 	<!-- ===================================================================== -->
@@ -154,7 +154,7 @@
 	<!-- Steps to do after  running package. -->
 	<!-- ===================================================================== -->
 	<target name="postPackage" if="mavenCompilePhase">
-	    <copy file="${buildDirectory}/${buildLabel}/jbossrules-eclipse-${jbossRulesVersion}.zip" tofile="${base}/jbossrules-eclipse-${jbossRulesVersion}.zip" />
+	    <copy file="${buildDirectory}/${buildLabel}/${zipFile}" tofile="${base}/${zipFile}" />
 	</target>
 
 	<!-- ===================================================================== -->
@@ -169,13 +169,13 @@
 	<!-- Steps to do to test the build results -->
 	<!-- ===================================================================== -->
   <target name="test" if="mavenTestPhase">  
-    <unzip src="${buildDirectory}/${buildLabel}/jbossrules-eclipse-${jbossRulesVersion}.zip"
+    <unzip src="${buildDirectory}/${buildLabel}/${zipFile}"
            dest="${base}/eclipse"/>
-    <unzip src="${buildDirectory}/${buildLabel}/jbossrules-eclipse-test-${jbossRulesVersion}.zip" 
+    <unzip src="${buildDirectory}/${buildLabel}/${testZipFile}" 
            dest="${base}/eclipse"/>    
 
 
-    <ant antfile="${base}/eclipse/plugins/org.drools.eclipse.test_${jbossRulesVersion}/test.xml">        
+    <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}" />

Modified: labs/jbossrules/trunk/drools-eclipse/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/pom.xml	2007-05-03 02:23:07 UTC (rev 11608)
+++ labs/jbossrules/trunk/drools-eclipse/pom.xml	2007-05-03 02:50:08 UTC (rev 11609)
@@ -11,7 +11,7 @@
   <artifactId>drools-eclipse</artifactId>
    <packaging>pom</packaging>
 
-  <name>Drools :: Eclipse-Plugin</name>�
+  <name>Drools :: Eclipse-Plugin</name>ি
   <build>
     <plugins>    
      <plugin>
@@ -175,6 +175,19 @@
              <goal>run</goal>
            </goals>
          </execution>         
+         
+         <execution>
+           <id>unzip</id>
+           <phase>package</phase>
+           <configuration>
+             <tasks>                
+                <unzip src="target/drools-eclipse-${project.version}.zip" dest="../target/eclipse"/>                         
+             </tasks>
+           </configuration>
+           <goals>
+             <goal>run</goal>
+           </goals>
+         </execution>         
        </executions>
      </plugin>
      

Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml	2007-05-03 02:23:07 UTC (rev 11608)
+++ labs/jbossrules/trunk/pom.xml	2007-05-03 02:50:08 UTC (rev 11609)
@@ -356,6 +356,7 @@
             <descriptor>src/main/assembly/bin.xml</descriptor>
             <descriptor>src/main/assembly/src.xml</descriptor>
             <descriptor>src/main/assembly/brms.xml</descriptor>
+            <descriptor>src/main/assembly/eclipse.xml</descriptor>
             <descriptor>src/main/assembly/examples.xml</descriptor>
           </descriptors>
         </configuration>

Modified: labs/jbossrules/trunk/src/main/assembly/bin.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/bin.xml	2007-05-03 02:23:07 UTC (rev 11608)
+++ labs/jbossrules/trunk/src/main/assembly/bin.xml	2007-05-03 02:50:08 UTC (rev 11609)
@@ -4,6 +4,8 @@
     <format>zip</format>
   </formats>
   
+  <includeBaseDirectory>false</includeBaseDirectory>
+  
   <fileSets>
   
     <fileSet>
@@ -21,11 +23,7 @@
        <directory>target/docs</directory>
        <outputDirectory>documentation/manual</outputDirectory>
     </fileSet>    
-    
-    
-    <fileSet>
-      <directory>src</directory>
-    </fileSet>
+
   </fileSets>  
 
   <moduleSets>

Modified: labs/jbossrules/trunk/src/main/assembly/eclipse.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/eclipse.xml	2007-05-03 02:23:07 UTC (rev 11608)
+++ labs/jbossrules/trunk/src/main/assembly/eclipse.xml	2007-05-03 02:50:08 UTC (rev 11609)
@@ -1,16 +1,18 @@
-
 <assembly>
   <id>eclipse</id>
   <formats>
     <format>zip</format>
   </formats>
   
-  <!-- We include the BRMS specifically, as its a single atomic war -->
-  <files>
-	<file>
-		<source>drools-eclipse/target/*.war</source>
-		<outputDirectory>brms</outputDirectory>
-	</file>
-  </files>
-   
+  <includeBaseDirectory>false</includeBaseDirectory>
+  
+  <fileSets>
+    <fileSet>
+      <directory>target/eclipse</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+         <include>**/**</include>
+      </includes>      
+    </fileSet>
+  </fileSets>
 </assembly>

Modified: labs/jbossrules/trunk/src/main/assembly/src.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/src.xml	2007-05-03 02:23:07 UTC (rev 11608)
+++ labs/jbossrules/trunk/src/main/assembly/src.xml	2007-05-03 02:50:08 UTC (rev 11609)
@@ -3,6 +3,9 @@
   <formats>
     <format>zip</format>
   </formats>
+  
+  <includeBaseDirectory>false</includeBaseDirectory>
+  
   <fileSets>
     <fileSet>
       <directory>.</directory>
@@ -12,7 +15,7 @@
          <include>drools-compiler/**</include>
          <include>drools-decisiontables/**</include>
          <include>drools-jsr94/**</include>
-         <include>drools-ide/**</include>
+         <include>drools-eclipse/**</include>
          <include>drools-repository/**</include>
          <include>drools-jbrms/**</include>
          <include>documentation/**</include>




More information about the jboss-svn-commits mailing list