From 5fa1ebbba430c69a5b400299aa0ca55871232bc9 Mon Sep 17 00:00:00 2001
From: Tommy Wang <tommy@gaixie.org>
Date: Fri, 5 Nov 2010 23:35:49 +0800
Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0=20dist=20=E5=8F=91=E5=B8=83?=
 =?utf8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8Cwar=E6=96=87=E4=BB=B6=E6=A0=BC?=
 =?utf8?q?=E5=BC=8F=E5=8F=AA=E7=94=A8=E4=BA=8E=E6=BC=94=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 assemblies/jibu/pom.xml                                 |  3 ++-
 assemblies/jibu/src/main/assembly/{bin.xml => demo.xml} |  2 +-
 assemblies/jibu/src/main/assembly/{bin.xml => dist.xml} | 10 +++++++---
 itest/war-itest-suite/pom.xml                           |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)
 copy assemblies/jibu/src/main/assembly/{bin.xml => demo.xml} (98%)
 rename assemblies/jibu/src/main/assembly/{bin.xml => dist.xml} (86%)

diff --git a/assemblies/jibu/pom.xml b/assemblies/jibu/pom.xml
index 053761e..03d8920 100644
--- a/assemblies/jibu/pom.xml
+++ b/assemblies/jibu/pom.xml
@@ -43,8 +43,9 @@
         </executions>
         <configuration>
           <descriptors>
-            <descriptor>src/main/assembly/bin.xml</descriptor>
+            <descriptor>src/main/assembly/demo.xml</descriptor>
             <descriptor>src/main/assembly/src.xml</descriptor>
+            <descriptor>src/main/assembly/dist.xml</descriptor>
           </descriptors>
           <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>
diff --git a/assemblies/jibu/src/main/assembly/bin.xml b/assemblies/jibu/src/main/assembly/demo.xml
similarity index 98%
copy from assemblies/jibu/src/main/assembly/bin.xml
copy to assemblies/jibu/src/main/assembly/demo.xml
index e1f8232..1a0178f 100644
--- a/assemblies/jibu/src/main/assembly/bin.xml
+++ b/assemblies/jibu/src/main/assembly/demo.xml
@@ -15,7 +15,7 @@
    limitations under the License.
   --> 
 <assembly>
-  <id>bin</id>
+  <id>demo</id>
   <formats>
     <format>war</format>
   </formats>
diff --git a/assemblies/jibu/src/main/assembly/bin.xml b/assemblies/jibu/src/main/assembly/dist.xml
similarity index 86%
rename from assemblies/jibu/src/main/assembly/bin.xml
rename to assemblies/jibu/src/main/assembly/dist.xml
index e1f8232..dabffb7 100644
--- a/assemblies/jibu/src/main/assembly/bin.xml
+++ b/assemblies/jibu/src/main/assembly/dist.xml
@@ -15,11 +15,12 @@
    limitations under the License.
   --> 
 <assembly>
-  <id>bin</id>
+  <id>dist</id>
   <formats>
-    <format>war</format>
+    <format>zip</format>
+    <format>tar.gz</format>
   </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
+  <includeBaseDirectory>true </includeBaseDirectory>
   <fileSets>
     <fileSet>
       <directory>../..</directory>
@@ -33,6 +34,9 @@
     <fileSet>
       <directory>../../jibu-web/jibu-core-extjs/target/jibu-core-extjs-${project.version}</directory>
       <outputDirectory></outputDirectory>
+      <excludes>
+        <exclude>**/derby*.jar</exclude>
+      </excludes>
     </fileSet>
   </fileSets>
 </assembly>
diff --git a/itest/war-itest-suite/pom.xml b/itest/war-itest-suite/pom.xml
index 828a87e..bfa1dd3 100644
--- a/itest/war-itest-suite/pom.xml
+++ b/itest/war-itest-suite/pom.xml
@@ -45,7 +45,7 @@
         <configuration>
           <encoding>utf-8</encoding>
           <systemPropertyVariables>
-            <warPath>../../assemblies/jibu/target/jibu-${project.version}-bin.war</warPath>
+            <warPath>../../assemblies/jibu/target/jibu-${project.version}-demo.war</warPath>
           </systemPropertyVariables>
         </configuration>
         <executions>
-- 
2.11.4.GIT