[jboss-svn-commits] JBL Code SVN: r20681 - in labs/jbossrules/trunk: drools-solver and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sat Jun 21 09:20:11 EDT 2008


Author: ge0ffrey
Date: 2008-06-21 09:20:10 -0400 (Sat, 21 Jun 2008)
New Revision: 20681

Added:
   labs/jbossrules/trunk/src/main/assembly/solver.xml
Removed:
   labs/jbossrules/trunk/drools-solver/src/main/assembly/bin.xml
Modified:
   labs/jbossrules/trunk/drools-solver/pom.xml
   labs/jbossrules/trunk/pom.xml
Log:
hook the solver assembly up into the main drools build

Modified: labs/jbossrules/trunk/drools-solver/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/pom.xml	2008-06-21 13:06:17 UTC (rev 20680)
+++ labs/jbossrules/trunk/drools-solver/pom.xml	2008-06-21 13:20:10 UTC (rev 20681)
@@ -29,18 +29,6 @@
                         <target>1.5</target>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <!--<version>2.2-beta-1</version>-->
-                    <configuration>
-                        <descriptors>
-                            <!--<descriptor>src/main/assembly/itc2007Examination/itc2007Examination.xml</descriptor>-->
-                            <descriptor>src/main/assembly/bin.xml</descriptor>
-                            <!--<descriptor>src/main/assembly/src.xml</descriptor>-->
-                        </descriptors>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>

Deleted: labs/jbossrules/trunk/drools-solver/src/main/assembly/bin.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/src/main/assembly/bin.xml	2008-06-21 13:06:17 UTC (rev 20680)
+++ labs/jbossrules/trunk/drools-solver/src/main/assembly/bin.xml	2008-06-21 13:20:10 UTC (rev 20681)
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-    <id>bin</id>
-    <formats>
-        <format>dir</format>
-        <format>zip</format>
-    </formats>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <fileSets>
-        <fileSet>
-          <directory>..</directory>
-          <includes>
-            <include>LICENSE-ASL-2.0.txt</include>
-            <include>JBossORG-EULA.txt</include>
-          </includes>
-          <outputDirectory/>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/assembly/scripts</directory>
-            <filtered>true</filtered>
-            <outputDirectory/>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/assembly/docs</directory>
-            <filtered>true</filtered>
-            <outputDirectory/>
-        </fileSet>
-        <!-- Examples -->
-        <fileSet>
-            <directory>drools-solver-examples/data/nqueens/unsolved</directory>
-            <outputDirectory>data/nqueens/unsolved</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/assembly/emptydir</directory>
-            <outputDirectory>data/nqueens/solved</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>drools-solver-examples/data/lessonschedule/unsolved</directory>
-            <outputDirectory>data/lessonschedule/unsolved</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/assembly/emptydir</directory>
-            <outputDirectory>data/lessonschedule/solved</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>drools-solver-examples/data/travelingtournament/smart/unsolved</directory>
-            <outputDirectory>data/travelingtournament/unsolved</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/assembly/emptydir</directory>
-            <outputDirectory>data/travelingtournament/solved</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>drools-solver-examples/data/itc2007/examination/smart/unsolved</directory>
-            <outputDirectory>data/itc2007/examination/unsolved</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/assembly/emptydir</directory>
-            <outputDirectory>data/itc2007/examination/solved</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>drools-solver-examples/data/itc2007/curriculumcourse/unsolved</directory>
-            <outputDirectory>data/itc2007/curriculumcourse/unsolved</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/assembly/emptydir</directory>
-            <outputDirectory>data/itc2007/curriculumcourse/solved</outputDirectory>
-        </fileSet>
-    </fileSets>
-
-    <moduleSets>
-        <moduleSet>
-            <includes>
-                <include>org.drools.solver:drools-solver-core</include>
-                <include>org.drools.solver:drools-solver-examples</include>
-            </includes>
-            <binaries>
-                <outputDirectory>lib</outputDirectory>
-                <unpack>false</unpack>
-                <dependencySets>
-                    <dependencySet>
-                        <outputDirectory>lib</outputDirectory>
-                        <unpack>false</unpack>
-                    </dependencySet>
-                </dependencySets>
-            </binaries>
-        </moduleSet>
-    </moduleSets>
-
-</assembly>

Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml	2008-06-21 13:06:17 UTC (rev 20680)
+++ labs/jbossrules/trunk/pom.xml	2008-06-21 13:20:10 UTC (rev 20681)
@@ -467,10 +467,11 @@
                         <descriptors>
                             <descriptor>src/main/assembly/bin.xml</descriptor>
 			                <descriptor>src/main/assembly/guvnor.xml</descriptor>
-                            <descriptor>src/main/assembly/src.xml</descriptor>                            
+                            <descriptor>src/main/assembly/src.xml</descriptor>
                             <descriptor>src/main/assembly/eclipse.xml</descriptor>
                             <descriptor>src/main/assembly/examples.xml</descriptor>
-                            <descriptor>src/main/assembly/docs.xml</descriptor>                            
+                            <descriptor>src/main/assembly/solver.xml</descriptor>
+                            <descriptor>src/main/assembly/docs.xml</descriptor>
                         </descriptors>
                     </configuration>
                 </plugin>

Copied: labs/jbossrules/trunk/src/main/assembly/solver.xml (from rev 20678, labs/jbossrules/trunk/drools-solver/src/main/assembly/bin.xml)
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/solver.xml	                        (rev 0)
+++ labs/jbossrules/trunk/src/main/assembly/solver.xml	2008-06-21 13:20:10 UTC (rev 20681)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+    <id>solver</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+          <includes>
+            <include>LICENSE-ASL-2.0.txt</include>
+            <include>JBossORG-EULA.txt</include>
+          </includes>
+          <outputDirectory/>
+        </fileSet>
+        <fileSet>
+            <directory>drools-solver/src/main/assembly/scripts</directory>
+            <filtered>true</filtered>
+            <outputDirectory/>
+        </fileSet>
+        <fileSet>
+            <directory>drools-solver/src/main/assembly/docs</directory>
+            <filtered>true</filtered>
+            <outputDirectory/>
+        </fileSet>
+        <!-- Examples -->
+        <fileSet>
+            <directory>drools-solver/drools-solver-examples</directory>
+            <outputDirectory/>
+            <includes>
+              <include>data/**/unsolved/*.xml</include>
+              <include>data/**/solved/*.xml</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+
+    <moduleSets>
+        <moduleSet>
+            <includes>
+                <include>org.drools.solver:drools-solver-core</include>
+                <include>org.drools.solver:drools-solver-examples</include>
+            </includes>
+            <binaries>
+                <outputDirectory>lib</outputDirectory>
+                <unpack>false</unpack>
+                <dependencySets>
+                    <dependencySet>
+                        <outputDirectory>lib</outputDirectory>
+                        <unpack>false</unpack>
+                    </dependencySet>
+                </dependencySets>
+            </binaries>
+        </moduleSet>
+    </moduleSets>
+
+</assembly>




More information about the jboss-svn-commits mailing list