Dims, Yes I did a "meven clean jar" and triedout integration security tests before I checked in the changes, and they worked :-)
Thanks, Ruchith On 1/7/06, Davanum Srinivas <[EMAIL PROTECTED]> wrote: > Ruchith, > > Did you run the integration tests? are they ok? > > thanks, > dims > > On 1/7/06, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote: > > 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"> > > > > > > > > > -- > Davanum Srinivas : http://wso2.com/blogs/ > -- Ruchith
