You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ru...@apache.org on 2006/12/02 04:42:14 UTC

svn commit: r481498 - in /webservices/axis2/branches/java/1_1/modules: integration/maven.xml security/maven.xml security/release-docs/build.xml

Author: ruchithf
Date: Fri Dec  1 19:42:13 2006
New Revision: 481498

URL: http://svn.apache.org/viewvc?view=rev&rev=481498
Log:
Getting rid of unnecessary classes from teh axis2-security.jar
Updated the rampart setup ant script to delete existing axiom-*-1.2.jar files


Modified:
    webservices/axis2/branches/java/1_1/modules/integration/maven.xml
    webservices/axis2/branches/java/1_1/modules/security/maven.xml
    webservices/axis2/branches/java/1_1/modules/security/release-docs/build.xml

Modified: webservices/axis2/branches/java/1_1/modules/integration/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/maven.xml?view=diff&rev=481498&r1=481497&r2=481498
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/maven.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/integration/maven.xml Fri Dec  1 19:42:13 2006
@@ -220,6 +220,9 @@
             <copy file="../addressing/target/addressing-${addressing_version}.mar"
                   tofile="target/test-resources/rampart_service_repo/modules/addressing-${addressing_version}.mar"/>
 
+		    <ant:path id="ramp.interop.test.classes" location="../security/target/interop/classes"/>
+            <maven:addPath id="maven.dependency.classpath" refid="ramp.interop.test.classes"/>
+        	
 		    <!-- Service 1 -->
 			<copy overwrite="yes" file="test-resources/rampart/services-1.xml"
                   tofile="target/temp-ramp/META-INF/services.xml"/>

Modified: webservices/axis2/branches/java/1_1/modules/security/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/maven.xml?view=diff&rev=481498&r1=481497&r2=481498
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/maven.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/security/maven.xml Fri Dec  1 19:42:13 2006
@@ -155,9 +155,9 @@
                 <ant:include name="**/oasisOpen/**/*.class"/>
                 <ant:include name="**/xmlmime/**/*.class"/>
                 <ant:include name="**/PWCallback.class"/>
-               
+                <ant:include name="**/InteropScenarioClient.class"/>
             </ant:fileset>
-    </ant:move>
+        </ant:move>
 
         <delete includeEmptyDirs="true">
             <fileset dir="${basedir}/target/classes/org/apache/axis2/oasis/"/>
@@ -199,9 +199,10 @@
         <copy file="interop/interop2.jks" 
             tofile="${class.dir}/interop2.jks" overwrite="yes"/>
         
-    <jar jarfile="target/PingPort.aar" basedir="target/interop/classes">
+    		<jar jarfile="target/PingPort.aar" basedir="target/interop/classes">
             <include name="**/*"/>
         </jar>
+      	
      </j:if>
     </postGoal>
 
@@ -210,6 +211,12 @@
         <copy toDir="target/classes/META-INF/services" overwrite="yes">
             <fileset dir="src/META-INF/services" />
         </copy>
+		<delete includeEmptyDirs="true">
+			<fileset dir="target/classes/org/xmlsoap/"/>
+			<fileset dir="target/classes/org/oasis_open/"/>
+			<fileset dir="target/classes/org/w3/"/>
+			<fileset file="target/classes/org/apache/axis2/security/InteropScenarioClient.class"/>
+		</delete>
     </preGoal>
 	
 </project>

Modified: webservices/axis2/branches/java/1_1/modules/security/release-docs/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/release-docs/build.xml?view=diff&rev=481498&r1=481497&r2=481498
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/release-docs/build.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/security/release-docs/build.xml Fri Dec  1 19:42:13 2006
@@ -33,6 +33,11 @@
    		<property name="axis2.modules.dir" value="${env.AXIS2_HOME}/repository/modules/"/>
    		<property name="axis2.lib.dir" value="${env.AXIS2_HOME}/lib"/>
 		
+		<!-- Delete exising axiom jars -->
+		<delete file="${axis2.lib.dir}/axiom-api-1.2.jar"/>
+		<delete file="${axis2.lib.dir}/axiom-impl-1.2.jar"/>
+		<delete file="${axis2.lib.dir}/axiom-dom-1.2.jar"/>
+
 		<copy todir="${axis2.lib.dir}">
 	        <fileset dir="${lib.dir}">
 	                <include name="**/*.jar"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org