Return-Path: 
 <axis-cvs-return-11536-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-dev-archive@www.apache.org
Received: (qmail 37826 invoked from network); 7 Jan 2006 08:30:33 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 7 Jan 2006 08:30:33 -0000
Received: (qmail 4115 invoked by uid 500); 7 Jan 2006 08:30:32 -0000
Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org
Received: (qmail 3874 invoked by uid 500); 7 Jan 2006 08:30:31 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
List-Post: <mailto:axis-cvs@ws.apache.org>
List-Id: <axis-cvs.ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 3863 invoked by uid 500); 7 Jan 2006 08:30:31 -0000
Delivered-To: apmail-ws-axis2-cvs@ws.apache.org
Received: (qmail 3860 invoked by uid 99); 7 Jan 2006 08:30:31 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Jan 2006 00:30:31 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sat, 07 Jan 2006 00:30:30 -0800
Received: (qmail 37717 invoked by uid 65534); 7 Jan 2006 08:30:10 -0000
Message-ID: <20060107083010.37716.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r366696 - in /webservices/axis2/trunk/java/modules:
 core/test/org/apache/axis2/storage/ security/maven.xml
 xml/test/org/apache/axis2/om/util/
Date: Sat, 07 Jan 2006 08:30:10 -0000
To: axis2-cvs@ws.apache.org
From: ruchithf@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: ruchithf
Date: Sat Jan  7 00:29:59 2006
New Revision: 366696

URL: http://svn.apache.org/viewcvs?rev=366696&view=rev
Log:
Fixed Axis2-363 & Removed empty dirs

Removed:
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/storage/
    webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/util/
Modified:
    webservices/axis2/trunk/java/modules/security/maven.xml

Modified: webservices/axis2/trunk/java/modules/security/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/maven.xml?rev=366696&r1=366695&r2=366696&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/security/maven.xml Sat Jan  7 00:29:59 2006
@@ -17,27 +17,40 @@
     </preGoal>
     
     <postGoal name="test:compile">
-        <mkdir dir="target/classes/META-INF"/>
+        <!-- Temp dir to hold the contents of the mar -->
+        <mkdir dir="target/temp-mar/META-INF"/>
+        <mkdir dir="target/temp-mar/lib"/>
+        
         <copy file="src/META-INF/module.xml"
-            tofile="target/classes/META-INF/module.xml"/>
+            tofile="target/temp-mar/META-INF/module.xml"/>
         <copy file="./test-resources/axis2.xml"
             tofile="target/axis2.xml"/>
         <mkdir dir="target/modules"/>
-        <mkdir dir="target/modules/lib"/>
 
-    <copy file="${maven.repo.local}/xml-security/jars/xmlsec-1.2.1.jar" todir="target/classes/lib"/>
-    <copy file="${maven.repo.local}/bouncycastle/jars/bcprov-jdk13-128.jar" todir="target/classes/lib"/>
-    <copy file="${maven.repo.local}/opensaml/jars/opensaml-1.0.1.jar" todir="target/classes/lib"/>
-    <copy file="${maven.repo.local}/wss4j/jars/wss4j-SNAPSHOT.jar" todir="target/classes/lib"/>
-    <copy file="${maven.repo.local}/jaxen/jars/jaxen-1.1-beta-7.jar" todir="target/classes/lib"/>
-    <copy file="${maven.repo.local}/xml-apis/jars/xml-apis-${xml_apis.version}.jar" todir="target/classes/lib"/>
-    <copy file="${maven.repo.local}/xerces/jars/xercesImpl-${xerces.version}.jar" todir="target/classes/lib"/>
+        <!-- Copy the required content for the mar into the temp dir-->
+        <copy todir="target/temp-mar">
+            <fileset dir="target/classes">
+                <include name="**/org/apache/axis2/*/**/*.class"/>
+                <exclude name="**/org/apache/axis2/security/trust/*/**"/>
+                <exclude name="**/org/apache/axis2/security/InteropScenarioClient.class"/>
+            </fileset>
+        </copy>
 
+        <copy file="${maven.repo.local}/xml-security/jars/xmlsec-1.2.1.jar" todir="target/temp-mar/lib"/>
+        <copy file="${maven.repo.local}/bouncycastle/jars/bcprov-jdk13-128.jar" todir="target/temp-mar/lib"/>
+        <copy file="${maven.repo.local}/opensaml/jars/opensaml-1.0.1.jar" todir="target/temp-mar/lib"/>
+        <copy file="${maven.repo.local}/wss4j/jars/wss4j-SNAPSHOT.jar" todir="target/temp-mar/lib"/>
+        <copy file="${maven.repo.local}/jaxen/jars/jaxen-1.1-beta-7.jar" todir="target/temp-mar/lib"/>
+        <copy file="${maven.repo.local}/xml-apis/jars/xml-apis-${xml_apis.version}.jar" todir="target/temp-mar/lib"/>
+        <copy file="${maven.repo.local}/xerces/jars/xercesImpl-${xerces.version}.jar" todir="target/temp-mar/lib"/>
 
-        <jar jarfile="target/security.mar" basedir="target/classes">
+        <jar jarfile="target/security.mar" basedir="target/temp-mar/">
             <include name="**/*"/>
         </jar>
         <copy file="target/security.mar" tofile="target/modules/security.mar"/>
+        <delete includeEmptyDirs="true">
+            <fileset dir="target/temp-mar"/>
+        </delete>
     </postGoal>
 
     <preGoal name="java:compile">