[jboss-svn-commits] JBL Code SVN: r36004 - labs/jbossrules/soa_branches/BRMS-5.1.x/brms-distribution.

[jboss-svn-commits at lists.jboss.org]

Author: dpalmer at redhat.com
Date: 2010-11-17 11:15:47 -0500 (Wed, 17 Nov 2010)
New Revision: 36004

Modified:
   labs/jbossrules/soa_branches/BRMS-5.1.x/brms-distribution/build.xml
   labs/jbossrules/soa_branches/BRMS-5.1.x/brms-distribution/pom.xml
Log:
Added drools-server

Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/brms-distribution/build.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/brms-distribution/build.xml	2010-11-17 13:17:28 UTC (rev 36003)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/brms-distribution/build.xml	2010-11-17 16:15:47 UTC (rev 36004)
@@ -9,9 +9,15 @@
     <war destfile="${module_base_dir}/target/work/jboss-brms.war" webxml="${module_base_dir}/target/work/drools-guvnor/WEB-INF/web.xml">
       <fileset dir="${module_base_dir}/target/work/drools-guvnor" includes="**/*" />
     </war>
+    <war destfile="${module_base_dir}/target/work/jboss-brms-server.war" webxml="${module_base_dir}/target/work/drools-server/WEB-INF/web.xml">
+      <fileset dir="${module_base_dir}/target/work/drools-server" includes="**/*" />
+    </war>
     <zip destfile="${module_base_dir}/target/dist/jboss-brms-manager.zip">
       <zipfileset dir="${module_base_dir}/target/work" includes="jboss-brms.war"/>
     </zip>
+    <zip destfile="${module_base_dir}/target/dist/jboss-brms-server.zip">
+      <zipfileset dir="${module_base_dir}/target/work" includes="jboss-brms-server.war"/>
+    </zip>
     <zip destfile="${module_base_dir}/target/dist/jboss-brms-engine.zip">
       <zipfileset dir="${module_base_dir}/target/jboss-brms-engine" includes="**/*" />
       <zipfileset dir="${module_base_dir}/target/" includes="jboss-brms-bulk-importer/**" />
@@ -21,7 +27,6 @@
     <zip destfile="${module_base_dir}/target/dist/modeshape.zip">
       <zipfileset dir="${module_base_dir}/target/work/modeshape" includes="**/*"/>
     </zip>
-    <!--copy tofile="${module_base_dir}/target/dist/jboss-brms-server.war" file="${module_base_dir}/target/dependency/drools-server-${project.version}.war" overwrite="true" /-->
 
     <zip destfile="${module_base_dir}/target/brms-deployable-${project.version}.zip" > 
       <zipfileset dir="${module_base_dir}/target/dist" includes="*" />
@@ -45,15 +50,15 @@
     <copy todir="${module_base_dir}/target/dist/brms-standalone/jboss-as-web/tools" overwrite="true">
       <fileset dir="${module_base_dir}/target/jboss-brms-bulk-importer" includes="**/*" />
     </copy>
+    <copy todir="${module_base_dir}/target/dist/brms-standalone/jboss-as-web/tools/jboss-brms-server.war" overwrite="true">
+      <fileset dir="${module_base_dir}/target/work/drools-server" includes="**/*" />
+    </copy>
     <antcall target="patch.modeshape">
     </antcall>
     <copy todir="${module_base_dir}/target/dist/brms-standalone/modeshape" overwrite="true">
       <fileset dir="${module_base_dir}/target/work/modeshape" includes="**/*" />
     </copy>
-    <copy todir="${module_base_dir}/target/dist/brms-standalone/modeshape" overwrite="true">
-      <fileset dir="${module_base_dir}/target/work/modeshape" includes="**/*" />
-    </copy>
-    
+
     <zip destfile="${module_base_dir}/target/brms-standalone-${project.version}.zip" > 
       <zipfileset dir="${module_base_dir}/target/dist/brms-standalone" prefix="brms-standalone-${project.version}" includes="**/*" filemode="755" />
     </zip>

Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/brms-distribution/pom.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/brms-distribution/pom.xml	2010-11-17 13:17:28 UTC (rev 36003)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/brms-distribution/pom.xml	2010-11-17 16:15:47 UTC (rev 36004)
@@ -101,9 +101,10 @@
                  <artifactItem>
                    <groupId>org.drools</groupId>
                    <artifactId>drools-guvnor</artifactId>
-                    <type>war</type>
+                   <version>${project.version}</version>
+                   <type>war</type>
                  </artifactItem>
-                </artifactItems>
+               </artifactItems>
              </configuration>
            </execution>
 
@@ -146,18 +147,19 @@
            </execution>
 
            <execution>
-             <id>copy-drools-server</id>
+             <id>unpack-drools-server</id>
              <phase>process-resources</phase>
              <goals>
-               <goal>copy</goal>
+               <goal>unpack</goal>
              </goals>
              <configuration>
+               <outputDirectory>${project.basedir}/target/work/drools-server</outputDirectory>
                <artifactItems>
                  <artifactItem>
                    <groupId>org.drools</groupId>
                    <artifactId>drools-server</artifactId>
                    <version>${project.version}</version>
-                    <type>war</type>
+                   <type>war</type>
                  </artifactItem>
                 </artifactItems>
              </configuration>