ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r397568 - in /webservices/axis2/trunk/java: etc/project.properties modules/integration/maven.xml modules/samples/maven.xml modules/security/maven.xml modules/tool/maven.xml
Date Thu, 27 Apr 2006 15:27:10 GMT
Author: dims
Date: Thu Apr 27 08:27:07 2006
New Revision: 397568

URL: http://svn.apache.org/viewcvs?rev=397568&view=rev
Log:
switch maven.jar.override to off, keep the old behavior

Modified:
    webservices/axis2/trunk/java/etc/project.properties
    webservices/axis2/trunk/java/modules/integration/maven.xml
    webservices/axis2/trunk/java/modules/samples/maven.xml
    webservices/axis2/trunk/java/modules/security/maven.xml
    webservices/axis2/trunk/java/modules/tool/maven.xml

Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=397568&r1=397567&r2=397568&view=diff
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Thu Apr 27 08:27:07 2006
@@ -137,7 +137,7 @@
 # ------------------------------------------------------------------------
 # M A V E N  J A R  O V E R R I D E
 # ------------------------------------------------------------------------
-maven.jar.override = on
+maven.jar.override =off
 
 # ------------------------------------------------------------------------
 # Jars set explicity by path.

Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=397568&r1=397567&r2=397568&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Thu Apr 27 08:27:07 2006
@@ -607,10 +607,18 @@
 
             <!-- Copying the DOM3 stuff to the endorsed dir -->
             <mkdir dir="target/test-resources/endorsed"/>
-            <copy file="${dependencies.dir}/xercesImpl-${xerces.version}.jar"
-                  todir="target/test-resources/endorsed"/>
-            <copy file="${dependencies.dir}/xml-apis-${xml_apis.version}.jar"
-                  todir="target/test-resources/endorsed"/>
+            <j:if test="${!context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('on')}">
+				<copy file="${dependencies.dir}/xercesImpl-${xerces.version}.jar"
+					  todir="target/test-resources/endorsed"/>
+				<copy file="${dependencies.dir}/xml-apis-${xml_apis.version}.jar"
+					  todir="target/test-resources/endorsed"/>
+            </j:if>
+            <j:if test="${!context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('off')}">
+				<copy file="${maven.repo.local}/xerces/jars/xercesImpl-${xerces.version}.jar"
+					  todir="target/test-resources/endorsed"/>
+				<copy file="${maven.repo.local}/xml-apis/jars/xml-apis-${xml_apis.version}.jar"
+					  todir="target/test-resources/endorsed"/>
+            </j:if>
 
 
             <!-- Scenario ST1 -->

Modified: webservices/axis2/trunk/java/modules/samples/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/maven.xml?rev=397568&r1=397567&r2=397568&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/maven.xml Thu Apr 27 08:27:07 2006
@@ -249,7 +249,12 @@
         <mkdir dir="target/classes/sample/groovy/sample/groovy"/>
         <ant:copy file="target/classes/sample/groovy/GroovyReceiver.class" tofile="target/classes/sample/groovy/sample/groovy/GroovyReceiver.class"/>
         <ant:delete file="target/classes/sample/groovy/GroovyReceiver.class"/>
-        <ant:copy file="${dependencies.dir}/groovy-all-1.0-jsr-01.jar" tofile="target/classes/sample/groovy/lib/groovy-all-1.0-jsr-01.jar"/>
+		<j:if test="${!context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('on')}">
+			<ant:copy file="${dependencies.dir}/groovy-all-1.0-jsr-01.jar" tofile="target/classes/sample/groovy/lib/groovy-all-1.0-jsr-01.jar"/>
+		</j:if>
+		<j:if test="${!context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('off')}">
+			<ant:copy file="${maven.repo.local}/groovy/jars/groovy-all-1.0-jsr-01.jar" tofile="target/classes/sample/groovy/lib/groovy-all-1.0-jsr-01.jar"/>
+		</j:if>
         <jar destfile="${samples.dir}/groovyService.aar">
             <fileset dir="target/classes/sample/groovy">
             </fileset>
@@ -301,11 +306,18 @@
     <!-- copy the local libs -->
     <mkdir dir="target/samples/security/lib"/>
     <ant:copy file="target/security/secUtil.jar" tofile="target/samples/security/lib/secUtil.jar"/>
-    <ant:copy file="${dependencies.dir}/xmlsec-${xmlsec.version}.jar" todir="target/samples/security/lib/"/>
-    <ant:copy file="${dependencies.dir}/bcprov-${bcprov.version}.jar" todir="target/samples/security/lib/"/>
-    <ant:copy file="${dependencies.dir}/wss4j-${wss4j.version}.jar" todir="target/samples/security/lib/"/>
-    <ant:copy file="${dependencies.dir}/commons-discovery-${commons.discovery.version}.jar"
todir="target/samples/security/lib/"/>
-    
+    <j:if test="${!context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('on')}">
+		<ant:copy file="${dependencies.dir}/xmlsec-${xmlsec.version}.jar" todir="target/samples/security/lib/"/>
+		<ant:copy file="${dependencies.dir}/bcprov-${bcprov.version}.jar" todir="target/samples/security/lib/"/>
+		<ant:copy file="${dependencies.dir}/wss4j-${wss4j.version}.jar" todir="target/samples/security/lib/"/>
+		<ant:copy file="${dependencies.dir}/commons-discovery-${commons.discovery.version}.jar"
todir="target/samples/security/lib/"/>
+    </j:if>
+    <j:if test="${!context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('off')}">
+		<ant:copy file="${maven.repo.local}/xml-security/jars/xmlsec-${xmlsec.version}.jar"
todir="target/samples/security/lib/"/>
+		<ant:copy file="${maven.repo.local}/bouncycastle/jars/bcprov-${bcprov.version}.jar"
todir="target/samples/security/lib/"/>
+		<ant:copy file="${maven.repo.local}/wss4j/jars/wss4j-${wss4j.version}.jar" todir="target/samples/security/lib/"/>
+		<ant:copy file="${maven.repo.local}/commons-discovery/jars/commons-discovery-${commons.discovery.version}.jar"
todir="target/samples/security/lib/"/>
+    </j:if>
     <ant:copy file="resources/security/README.txt" tofile="target/samples/security/README.txt"/>
     <ant:copy file="resources/security/build.xml" tofile="target/samples/security/build.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=397568&r1=397567&r2=397568&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/security/maven.xml Thu Apr 27 08:27:07 2006
@@ -32,14 +32,26 @@
             </fileset>
         </copy>
 
-        <copy file="${dependencies.dir}/xmlsec-${xmlsec.version}.jar" todir="target/temp-mar/lib"/>
-        <copy file="${dependencies.dir}/bcprov-${bcprov.version}.jar" todir="target/temp-mar/lib"/>
-        <copy file="${dependencies.dir}/opensaml-${opensaml.version}.jar" todir="target/temp-mar/lib"/>
-        <copy file="${dependencies.dir}/wss4j-${wss4j.version}.jar" todir="target/temp-mar/lib"/>
-        <copy file="${dependencies.dir}/jaxen-${jaxen.version}.jar" todir="target/temp-mar/lib"/>
-        <copy file="${dependencies.dir}/xml-apis-${xml_apis.version}.jar" todir="target/temp-mar/lib"/>
-        <copy file="${dependencies.dir}/xercesImpl-${xerces.version}.jar" todir="target/temp-mar/lib"/>
-        <copy file="${dependencies.dir}/commons-codec-${commons.codec.version}.jar" todir="target/temp-mar/lib"/>
+		<j:if test="${!context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('on')}">
+			<copy file="${dependencies.dir}/xmlsec-${xmlsec.version}.jar" todir="target/temp-mar/lib"/>
+			<copy file="${dependencies.dir}/bcprov-${bcprov.version}.jar" todir="target/temp-mar/lib"/>
+			<copy file="${dependencies.dir}/opensaml-${opensaml.version}.jar" todir="target/temp-mar/lib"/>
+			<copy file="${dependencies.dir}/wss4j-${wss4j.version}.jar" todir="target/temp-mar/lib"/>
+			<copy file="${dependencies.dir}/jaxen-${jaxen.version}.jar" todir="target/temp-mar/lib"/>
+			<copy file="${dependencies.dir}/xml-apis-${xml_apis.version}.jar" todir="target/temp-mar/lib"/>
+			<copy file="${dependencies.dir}/xercesImpl-${xerces.version}.jar" todir="target/temp-mar/lib"/>
+			<copy file="${dependencies.dir}/commons-codec-${commons.codec.version}.jar" todir="target/temp-mar/lib"/>
+        </j:if>
+		<j:if test="${!context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('off')}">
+			<copy file="${maven.repo.local}/xml-security/jars/xmlsec-${xmlsec.version}.jar" todir="target/temp-mar/lib"/>
+			<copy file="${maven.repo.local}/bouncycastle/jars/bcprov-${bcprov.version}.jar" todir="target/temp-mar/lib"/>
+			<copy file="${maven.repo.local}/opensaml/jars/opensaml-${opensaml.version}.jar" todir="target/temp-mar/lib"/>
+			<copy file="${maven.repo.local}/wss4j/jars/wss4j-${wss4j.version}.jar" todir="target/temp-mar/lib"/>
+			<copy file="${maven.repo.local}/jaxen/jars/jaxen-${jaxen.version}.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"/>
+			<copy file="${maven.repo.local}/commons-codec/jars/commons-codec-${commons.codec.version}.jar"
todir="target/temp-mar/lib"/>
+        </j:if>
         
 
 		<copy file="src/META-INF/rahas-module.xml"
@@ -86,10 +98,18 @@
             </fileset>
         </copy>
         <!-- copy jars -->
-        <copy file="${dependencies.dir}/xmlsec-${xmlsec.version}.jar" todir="target/sts/lib"/>
-        <copy file="${dependencies.dir}/bcprov-${bcprov.version}.jar" todir="target/sts/lib"/>
-        <copy file="${dependencies.dir}/opensaml-${opensaml.version}.jar" todir="target/sts/lib"/>
-        <copy file="${dependencies.dir}/wss4j-${wss4j.version}.jar" todir="target/sts/lib"/>
       
+        <j:if test="${!context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('on')}">
+			<copy file="${dependencies.dir}/xmlsec-${xmlsec.version}.jar" todir="target/sts/lib"/>
+			<copy file="${dependencies.dir}/bcprov-${bcprov.version}.jar" todir="target/sts/lib"/>
+			<copy file="${dependencies.dir}/opensaml-${opensaml.version}.jar" todir="target/sts/lib"/>
+			<copy file="${dependencies.dir}/wss4j-${wss4j.version}.jar" todir="target/sts/lib"/>
       
+        </j:if>
+        <j:if test="${!context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('off')}">
+			<copy file="${maven.repo.local}/xml-security/jars/xmlsec-${xmlsec.version}.jar" todir="target/sts/lib"/>
+			<copy file="${maven.repo.local}/bouncycastle/jars/bcprov-${bcprov.version}.jar" todir="target/sts/lib"/>
+			<copy file="${maven.repo.local}/opensaml/jars/opensaml-${opensaml.version}.jar" todir="target/sts/lib"/>
+			<copy file="${maven.repo.local}/wss4j/jars/wss4j-${wss4j.version}.jar" todir="target/sts/lib"/>
       
+        </j:if>
         
         <copy file="test-resources/trust/impl/sts-services.xml" toFile="target/sts/META-INF/services.xml"/>
 		<copy file="test-resources/trust/impl/sct-issuer-config.xml" toFile="target/sts/META-INF/sct-issuer-config.xml"/>

Modified: webservices/axis2/trunk/java/modules/tool/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/maven.xml?rev=397568&r1=397567&r2=397568&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/maven.xml Thu Apr 27 08:27:07 2006
@@ -19,7 +19,12 @@
                 <include name="axis2*.jar"/>
             </fileset>
         </copy>
-        <copy file="${dependencies.dir}/ant-1.6.2.jar" todir="target/jar-tool"/>
+        <j:if test="${!context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('on')}">
+			<copy file="${dependencies.dir}/ant-1.6.2.jar" todir="target/jar-tool"/>
+        </j:if>
+        <j:if test="${!context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('off')}">
+			<copy file="${maven.repo.local}/ant/jars/ant-1.6.2.jar" todir="target/jar-tool"/>
+        </j:if>
         <copy file="src/script/jar-tool-UI.bat" todir="target/jar-tool"></copy>
     </goal>
     



Mime
View raw message