Author: veithen
Date: Mon Aug 15 09:10:50 2011
New Revision: 1157744
URL: http://svn.apache.org/viewvc?rev=1157744&view=rev
Log:
Merged a couple of improvements to the build system from the trunk: r1089599,
r1157670, r1157672, r1157674, r1157724 and r1157731.
Added:
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/resources/log4j.properties
- copied, changed from r1089599,
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/test-resources/log4j.properties
- copied unchanged from r1157670,
axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/log4j.properties
Removed:
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/java/commons-logging.properties
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/resources/commons-logging.properties
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/distribution/src.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_6/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 15 09:10:50 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731
Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml?rev=1157744&r1=1157743&r2=1157744&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml Mon Aug
15 09:10:50 2011
@@ -120,11 +120,6 @@
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- <version>${bcprov.jdk14.version}</version>
- </dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
<version>${bcprov.jdk15.version}</version>
</dependency>
Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/src.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/src.xml?rev=1157744&r1=1157743&r2=1157744&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/distribution/src.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/distribution/src.xml Mon Aug
15 09:10:50 2011
@@ -8,7 +8,7 @@
<fileSets>
<fileSet>
<directory>../..</directory>
- <outputDirectory>rampart-src-${rampart.version}</outputDirectory>
+ <outputDirectory>rampart-src-${project.version}</outputDirectory>
<includes>
<include>**/modules/**/*</include>
<include>**/pom.xml</include>
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml?rev=1157744&r1=1157743&r2=1157744&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
Mon Aug 15 09:10:50 2011
@@ -51,7 +51,7 @@
<artifactItem>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
- <version>${rampart.mar.version}</version>
+ <version>${project.version}</version>
<type>mar</type>
<overWrite>true</overWrite>
<outputDirectory>target/artifacts</outputDirectory>
@@ -59,7 +59,7 @@
<artifactItem>
<groupId>org.apache.rampart</groupId>
<artifactId>rahas</artifactId>
- <version>${rahas.mar.version}</version>
+ <version>${project.version}</version>
<type>mar</type>
<overWrite>true</overWrite>
<outputDirectory>target/artifacts</outputDirectory>
@@ -134,7 +134,7 @@
<tasks>
<property name="addressing.mar"
value="addressing-${axis2.version}.mar" />
<copy
file="target/artifacts/addressing-${axis2.version}.mar"
tofile="target/test-classes/modules/addressing-${axis2.version}.mar" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-classes/modules/rampart-${rampart.mar.version}.mar" />
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-classes/modules/rampart-${project.version}.mar" />
<mkdir dir="target/temp-ramp" />
<mkdir dir="target/temp-ramp/META-INF" />
@@ -147,15 +147,15 @@
<mkdir
dir="target/test-resources/rampart_client_repo" />
<mkdir
dir="target/test-resources/rampart_client_repo/conf" />
<mkdir
dir="target/test-resources/rampart_client_repo/modules" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/rampart_client_repo/modules/rampart-${rampart.mar.version}.mar"
/>
- <copy
file="target/artifacts/rahas-${rahas.mar.version}.mar"
tofile="target/test-resources/rampart_client_repo/modules/rahas-${rahas.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/rampart_client_repo/modules/rampart-${project.version}.mar"
/>
+ <copy
file="target/artifacts/rahas-${project.version}.mar"
tofile="target/test-resources/rampart_client_repo/modules/rahas-${project.version}.mar"
/>
<copy
file="target/artifacts/addressing-${axis2.version}.mar"
tofile="target/test-resources/rampart_client_repo/modules/addressing-${axis2.version}.mar"
/>
<mkdir
dir="target/test-resources/rampart_service_repo" />
<mkdir
dir="target/test-resources/rampart_service_repo/conf" />
<mkdir
dir="target/test-resources/rampart_service_repo/services" />
<mkdir
dir="target/test-resources/rampart_service_repo/modules" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/rampart_service_repo/modules/rampart-${rampart.mar.version}.mar"
/>
- <copy
file="target/artifacts/rahas-${rahas.mar.version}.mar"
tofile="target/test-resources/rampart_service_repo/modules/rahas-${rahas.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/rampart_service_repo/modules/rampart-${project.version}.mar"
/>
+ <copy
file="target/artifacts/rahas-${project.version}.mar"
tofile="target/test-resources/rampart_service_repo/modules/rahas-${project.version}.mar"
/>
<copy
file="target/artifacts/addressing-${axis2.version}.mar"
tofile="target/test-resources/rampart_service_repo/modules/addressing-${axis2.version}.mar"
/>
<!-- Service 1 -->
@@ -306,14 +306,14 @@
<mkdir
dir="target/test-resources/rahas_client_repo/conf" />
<mkdir
dir="target/test-resources/rahas_client_repo/modules" />
<copy
file="target/artifacts/addressing-${axis2.version}.mar"
tofile="target/test-resources/rahas_client_repo/modules/addressing-${axis2.version}.mar"
/>
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/rahas_client_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/rahas_client_repo/modules/rampart-${project.version}.mar"
/>
<!-- Rahas Test1: SAML Token test -->
<mkdir
dir="target/test-resources/rahas_service_repo_1" />
<mkdir
dir="target/test-resources/rahas_service_repo_1/conf" />
<mkdir
dir="target/test-resources/rahas_service_repo_1/services" />
<mkdir
dir="target/test-resources/rahas_service_repo_1/modules" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/rahas_service_repo_1/modules/rampart-${rampart.mar.version}.mar"
/>
- <copy
file="target/artifacts/rahas-${rahas.mar.version}.mar"
tofile="target/test-resources/rahas_service_repo_1/modules/rahas-${rahas.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/rahas_service_repo_1/modules/rampart-${project.version}.mar"
/>
+ <copy
file="target/artifacts/rahas-${project.version}.mar"
tofile="target/test-resources/rahas_service_repo_1/modules/rahas-${project.version}.mar"
/>
<copy
file="target/artifacts/addressing-${axis2.version}.mar"
tofile="target/test-resources/rahas_service_repo_1/modules/addressing-${axis2.version}.mar"
/>
<!-- copy the services.xml and create the aar
-->
<copy overwrite="yes"
file="src/test/resources/rahas/s1-services.xml"
tofile="target/temp-rahas/META-INF/services.xml" />
@@ -326,8 +326,8 @@
<mkdir
dir="target/test-resources/rahas_service_repo_3/conf" />
<mkdir
dir="target/test-resources/rahas_service_repo_3/services" />
<mkdir
dir="target/test-resources/rahas_service_repo_3/modules" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/rahas_service_repo_3/modules/rampart-${rampart.mar.version}.mar"
/>
- <copy
file="target/artifacts/rahas-${rahas.mar.version}.mar"
tofile="target/test-resources/rahas_service_repo_3/modules/rahas-${rahas.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/rahas_service_repo_3/modules/rampart-${project.version}.mar"
/>
+ <copy
file="target/artifacts/rahas-${project.version}.mar"
tofile="target/test-resources/rahas_service_repo_3/modules/rahas-${project.version}.mar"
/>
<copy
file="target/artifacts/addressing-${axis2.version}.mar"
tofile="target/test-resources/rahas_service_repo_3/modules/addressing-${axis2.version}.mar"
/>
<!-- copy the services.xml and create the aar
-->
<copy overwrite="yes"
file="src/test/resources/rahas/s3-services.xml"
tofile="target/temp-rahas/META-INF/services.xml" />
@@ -338,7 +338,7 @@
<mkdir
dir="target/test-resources/default_security_client_repo" />
<mkdir
dir="target/test-resources/default_security_client_repo/conf" />
<mkdir
dir="target/test-resources/default_security_client_repo/modules" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/default_security_client_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/default_security_client_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="target/artifacts/addressing-${axis2.version}.mar"
tofile="target/test-resources/default_security_client_repo/modules/addressing-${axis2.version}.mar"
/>
<copy file="src/test/resources/conf/axis2.xml"
tofile="target/test-resources/default_security_client_repo/conf/axis2.xml" />
<!--
@@ -348,8 +348,8 @@
<mkdir
dir="target/test-resources/rahas_service_repo_5/conf" />
<mkdir
dir="target/test-resources/rahas_service_repo_5/services" />
<mkdir
dir="target/test-resources/rahas_service_repo_5/modules" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/rahas_service_repo_5/modules/rampart-${rampart.mar.version}.mar"
/>
- <copy
file="target/artifacts/rahas-${rahas.mar.version}.mar"
tofile="target/test-resources/rahas_service_repo_5/modules/rahas-${rahas.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/rahas_service_repo_5/modules/rampart-${project.version}.mar"
/>
+ <copy
file="target/artifacts/rahas-${project.version}.mar"
tofile="target/test-resources/rahas_service_repo_5/modules/rahas-${project.version}.mar"
/>
<copy
file="target/artifacts/addressing-${axis2.version}.mar"
tofile="target/test-resources/rahas_service_repo_5/modules/addressing-${axis2.version}.mar"
/>
<!-- copy the services.xml and create the aar
-->
<copy overwrite="yes"
file="src/test/resources/rahas/s5-services.xml"
tofile="target/temp-rahas/META-INF/services.xml" />
@@ -367,10 +367,10 @@
<mkdir
dir="target/test-resources/scenario1_service_repo/modules" />
<!-- setup scenario 1 client repository-->
<copy
file="src/test/resources/security/s1.client.axis2.xml"
tofile="target/test-resources/scenario1_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario1_client_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario1_client_repo/modules/rampart-${project.version}.mar"
/>
<!-- setup scenario 1 service repository-->
<copy
file="src/test/resources/security/s1.service.axis2.xml"
tofile="target/test-resources/scenario1_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario1_service_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario1_service_repo/modules/rampart-${project.version}.mar"
/>
<mkdir dir="target/temp-interop/META-INF" />
@@ -386,9 +386,9 @@
<mkdir
dir="target/test-resources/scenario2_service_repo/services" />
<mkdir
dir="target/test-resources/scenario2_service_repo/modules" />
<copy
file="src/test/resources/security/s2.client.axis2.xml"
tofile="target/test-resources/scenario2_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario2_client_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario2_client_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/s2.service.axis2.xml"
tofile="target/test-resources/scenario2_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario2_service_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario2_service_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/s2.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar
jarfile="target/test-resources/scenario2_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
@@ -401,9 +401,9 @@
<mkdir
dir="target/test-resources/scenario2a_service_repo/services" />
<mkdir
dir="target/test-resources/scenario2a_service_repo/modules" />
<copy
file="src/test/resources/security/s2a.client.axis2.xml"
tofile="target/test-resources/scenario2a_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario2a_client_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario2a_client_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/s2a.service.axis2.xml"
tofile="target/test-resources/scenario2a_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario2a_service_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario2a_service_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/s2a.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar
jarfile="target/test-resources/scenario2a_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
<!-- Scenario 3 -->
@@ -415,9 +415,9 @@
<mkdir
dir="target/test-resources/scenario3_service_repo/services" />
<mkdir
dir="target/test-resources/scenario3_service_repo/modules" />
<copy
file="src/test/resources/security/s3.client.axis2.xml"
tofile="target/test-resources/scenario3_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario3_client_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario3_client_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/s3.service.axis2.xml"
tofile="target/test-resources/scenario3_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario3_service_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario3_service_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/s3.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar
jarfile="target/test-resources/scenario3_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
@@ -430,9 +430,9 @@
<mkdir
dir="target/test-resources/scenario4_service_repo/services" />
<mkdir
dir="target/test-resources/scenario4_service_repo/modules" />
<copy
file="src/test/resources/security/s4.client.axis2.xml"
tofile="target/test-resources/scenario4_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario4_client_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario4_client_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/s4.service.axis2.xml"
tofile="target/test-resources/scenario4_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario4_service_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario4_service_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/s4.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar
jarfile="target/test-resources/scenario4_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
@@ -445,9 +445,9 @@
<mkdir
dir="target/test-resources/scenario5_service_repo/services" />
<mkdir
dir="target/test-resources/scenario5_service_repo/modules" />
<copy
file="src/test/resources/security/s5.client.axis2.xml"
tofile="target/test-resources/scenario5_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario5_client_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario5_client_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/s5.service.axis2.xml"
tofile="target/test-resources/scenario5_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario5_service_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario5_service_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/s5.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar
jarfile="target/test-resources/scenario5_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
@@ -460,9 +460,9 @@
<mkdir
dir="target/test-resources/scenario6_service_repo/services" />
<mkdir
dir="target/test-resources/scenario6_service_repo/modules" />
<copy
file="src/test/resources/security/s6.client.axis2.xml"
tofile="target/test-resources/scenario6_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario6_client_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario6_client_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/s6.service.axis2.xml"
tofile="target/test-resources/scenario6_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario6_service_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario6_service_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/s6.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar
jarfile="target/test-resources/scenario6_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
@@ -475,9 +475,9 @@
<mkdir
dir="target/test-resources/scenario7_service_repo/services" />
<mkdir
dir="target/test-resources/scenario7_service_repo/modules" />
<copy
file="src/test/resources/security/s7.client.axis2.xml"
tofile="target/test-resources/scenario7_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario7_client_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario7_client_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/s7.service.axis2.xml"
tofile="target/test-resources/scenario7_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenario7_service_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario7_service_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/s7.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar
jarfile="target/test-resources/scenario7_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
@@ -490,9 +490,9 @@
<mkdir
dir="target/test-resources/scenarioST1_service_repo/services" />
<mkdir
dir="target/test-resources/scenarioST1_service_repo/modules" />
<copy
file="src/test/resources/security/sST1.client.axis2.xml"
tofile="target/test-resources/scenarioST1_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenarioST1_client_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenarioST1_client_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/sST1.service.axis2.xml"
tofile="target/test-resources/scenarioST1_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/scenarioST1_service_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenarioST1_service_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/sST1.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar
jarfile="target/test-resources/scenarioST1_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
@@ -505,9 +505,9 @@
<mkdir
dir="target/test-resources/mtom_sec_service_repo/services" />
<mkdir
dir="target/test-resources/mtom_sec_service_repo/modules" />
<copy
file="src/test/resources/security/secMtom.client.axis2.xml"
tofile="target/test-resources/mtom_sec_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/mtom_sec_client_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/mtom_sec_client_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/secMtom.service.axis2.xml"
tofile="target/test-resources/mtom_sec_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/mtom_sec_service_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/mtom_sec_service_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="src/test/resources/security/secMtom.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar
jarfile="target/test-resources/mtom_sec_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
@@ -521,11 +521,11 @@
<mkdir
dir="target/test-resources/complete_service_repo/modules" />
<!-- Test with addressing and MTOM client
repository-->
<copy
file="src/test/resources/security/complete.client.axis2.xml"
tofile="target/test-resources/complete_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/complete_client_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/complete_client_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="target/artifacts/addressing-${axis2.version}.mar"
tofile="target/test-resources/complete_client_repo/modules/addressing-${axis2.version}.mar"
/>
<!-- Test with addressing and MTOMservice
repository-->
<copy
file="src/test/resources/security/complete.service.axis2.xml"
tofile="target/test-resources/complete_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${rampart.mar.version}.mar"
tofile="target/test-resources/complete_service_repo/modules/rampart-${rampart.mar.version}.mar"
/>
+ <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/complete_service_repo/modules/rampart-${project.version}.mar"
/>
<copy
file="target/artifacts/addressing-${axis2.version}.mar"
tofile="target/test-resources/complete_service_repo/modules/addressing-${axis2.version}.mar"
/>
<copy
file="src/test/resources/security/complete.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<!-- Create the .aar file -->
@@ -606,6 +606,14 @@
<version>${junit.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
</dependencies>
<reporting>
Copied:
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/resources/log4j.properties
(from r1089599,
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties)
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/resources/log4j.properties?p2=axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/resources/log4j.properties&p1=axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties&r1=1089599&r2=1157744&rev=1157744&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/resources/log4j.properties
Mon Aug 15 09:10:50 2011
@@ -17,7 +17,7 @@
# under the License.
#
-log4j.rootCategory=INFO, CONSOLE
+log4j.rootCategory=ERROR, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml?rev=1157744&r1=1157743&r2=1157744&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml Mon Aug
15 09:10:50 2011
@@ -74,6 +74,14 @@
<artifactId>rampart-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
</dependencies>
<reporting>
Modified: axis/axis2/java/rampart/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1157744&r1=1157743&r2=1157744&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Mon Aug 15 09:10:50 2011
@@ -237,49 +237,27 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
<version>2.2.3</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.5.2</version>
+ <exclusions>
+ <!-- Don't allow OpenSAML to impose a particular logging
implementation -->
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.3</version>
</dependency>
-
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- <exclusion>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>${bcprov.jdk15.version}</version>
</dependency>
<!-- Junit Dependency -->
@@ -311,40 +289,48 @@
<artifactId>axiom-dom</artifactId>
<version>${axiom.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.5</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.15</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
<profiles>
<profile>
- <id>jdk14</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <jdk>1.4</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- <version>${bcprov.jdk14.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>jdk15</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>${bcprov.jdk15.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
<id>apache-release</id>
<activation>
<property>
@@ -401,36 +387,19 @@
</modules>
<properties>
-
- <rampart.version>${project.version}</rampart.version>
- <rampart.mar.version>${project.version}</rampart.mar.version>
- <rahas.mar.version>${project.version}</rahas.mar.version>
-
<axis2.version>1.6.1-SNAPSHOT</axis2.version>
<axiom.version>1.2.12</axiom.version>
<wss4j.version>1.5.11</wss4j.version>
<opensaml.version>1.1</opensaml.version>
- <bcprov.jdk14.version>140</bcprov.jdk14.version>
<bcprov.jdk15.version>140</bcprov.jdk15.version>
<junit.version>3.8.2</junit.version>
- <log4j.version>1.2.15</log4j.version>
<!-- distribution properties -->
<dist.dir>rampart-${project.version}</dist.dir>
<failIfNoTests>false</failIfNoTests>
</properties>
-
- <distributionManagement>
- <snapshotRepository>
- <id>apache.snapshots.https</id>
- <name>${distMgmtSnapshotsName}</name>
- <url>${distMgmtSnapshotsUrl}</url>
- <uniqueVersion>false</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
-
</project>
