[jboss-svn-commits] JBL Code SVN: r34902 - in labs/jbossrules/soa_branches/BRMS-5.1.1: brms-distribution/post-patch and 5 other directories.

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

Author: ryanzhang
Date: 2010-08-26 10:57:19 -0400 (Thu, 26 Aug 2010)
New Revision: 34902

Added:
   labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/resource/logo/
   labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/resource/logo/hdrlogo_brms.gif
Removed:
   labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/public/hdrlogo_brms.gif
   labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/public/images/hdrlogo_brms.gif
Modified:
   labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/build.xml
   labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/pom.xml
   labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/post-patch/patch_brms_ui.xml
   labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/resource/assembly/brms-engine.xml
Log:
Move hdrlog_brms into brms-distribution module

Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/build.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/build.xml	2010-08-26 14:21:29 UTC (rev 34901)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/build.xml	2010-08-26 14:57:19 UTC (rev 34902)
@@ -1,4 +1,4 @@
-<project name="SOA jbpm console builder">
+<project name="BRMS ant builder">
 
 	<target name="build">
     <echo file="${module_base_dir}/target/work/drools-guvnor/org.drools.guvnor.Guvnor/version.txt">${project.version} </echo>
@@ -6,7 +6,7 @@
 
 	<target name="assemble">
     <mkdir dir="${module_base_dir}/target/dist"/>
-    <war destfile="${module_base_dir}/target/dist/jboss-brms.war" webxml="${module_base_dir}/target/work/drools-guvnor/WEB-INF/web.xml">
+    <war destfile="${module_base_dir}/target/dist/jboss-brms-manager.war" webxml="${module_base_dir}/target/work/drools-guvnor/WEB-INF/web.xml">
       <fileset dir="${module_base_dir}/target/work/drools-guvnor" includes="**/*" />
     </war>
     <zip destfile="${module_base_dir}/target/dist/jboss-brms-engine.zip">

Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/pom.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/pom.xml	2010-08-26 14:21:29 UTC (rev 34901)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/pom.xml	2010-08-26 14:57:19 UTC (rev 34902)
@@ -55,7 +55,6 @@
          drools-simular
          drools-gwt-console
          drools-clips
-         drools-clips
          drools-simulator
       -->
       <dependency>
@@ -97,10 +96,11 @@
         <groupId>org.drools</groupId>
         <artifactId>drools-templates</artifactId>
       </dependency>
-      <!--dependency>
+
+      <dependency>
         <groupId>org.drools</groupId>
         <artifactId>drools-grid-core</artifactId>
-      </dependency-->
+      </dependency>
 
       <!--The following is CTP feature(Community Tech Preview)-->
       <dependency>

Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/post-patch/patch_brms_ui.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/post-patch/patch_brms_ui.xml	2010-08-26 14:21:29 UTC (rev 34901)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/post-patch/patch_brms_ui.xml	2010-08-26 14:57:19 UTC (rev 34902)
@@ -13,7 +13,8 @@
         <replacefilter token="Bienvenidos a Guvnor" value="Bienvenidos a BRMS" />
         <replacefilter token="Guvnor segun sus necesidades." value="BRMS segun sus necesidades." />
       </replace>      
-      <copy file="${module_base_dir}/target/work/drools-guvnor/org.drools.guvnor.Guvnor/hdrlogo_brms.gif" tofile="${module_base_dir}/target/work/drools-guvnor/org.drools.guvnor.Guvnor/header_logo.gif" overwrite="true"/>
+      <copy file="${module_base_dir}/resource/logo/hdrlogo_brms.gif" tofile="${module_base_dir}/target/work/drools-guvnor/org.drools.guvnor.Guvnor/header_logo.gif" overwrite="true"/>
+      <copy file="${module_base_dir}/resource/logo/hdrlogo_brms.gif" tofile="${module_base_dir}/target/work/drools-guvnor/org.drools.guvnor.Guvnor/images/header_logo.gif" overwrite="true"/>
 
 	</target>
 </project>

Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/resource/assembly/brms-engine.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/resource/assembly/brms-engine.xml	2010-08-26 14:21:29 UTC (rev 34901)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/resource/assembly/brms-engine.xml	2010-08-26 14:57:19 UTC (rev 34902)
@@ -24,7 +24,7 @@
        <exclude>javax.xml.bind:jaxb-api</exclude>
        <exclude>jaxen:jaxen</exclude>
        <exclude>org.codehaus.jettison:jettison</exclude>
-       <exclude>javax.xml.stream:stax-api</exclude>
+       <exclude>*:stax-api</exclude>
 
        <!--Test dependency-->
        <exclude>junit:junit</exclude>

Copied: labs/jbossrules/soa_branches/BRMS-5.1.1/brms-distribution/resource/logo/hdrlogo_brms.gif (from rev 34884, labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/public/hdrlogo_brms.gif)
===================================================================
(Binary files differ)

Deleted: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/public/hdrlogo_brms.gif
===================================================================
(Binary files differ)

Deleted: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/public/images/hdrlogo_brms.gif
===================================================================
(Binary files differ)