Author: dkulp
Date: Thu Aug 27 16:23:37 2009
New Revision: 808495
URL: http://svn.apache.org/viewvc?rev=808495&view=rev
Log:
Merged revisions 806633 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r806633 | dkulp | 2009-08-21 12:35:19 -0400 (Fri, 21 Aug 2009) | 1 line
Update so ws/security tests run with jdk 1.6.0_16
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/parent/pom.xml
cxf/branches/2.2.x-fixes/rt/ws/security/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 27 16:23:37 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631,806633
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/parent/pom.xml?rev=808495&r1=808494&r2=808495&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/parent/pom.xml Thu Aug 27 16:23:37 2009
@@ -70,6 +70,10 @@
<spring.validation.mode>VALIDATION_AUTO</spring.validation.mode>
<downloadSources>true</downloadSources>
+
+ <extra.surefire.syspropery.name>None</extra.surefire.syspropery.name>
+ <extra.surefire.syspropery.value>None</extra.surefire.syspropery.value>
+
</properties>
@@ -291,9 +295,10 @@
<value>${surefire.fork.vmargs}</value>
</property>
<property>
- <name>java.security.properties</name>
-
<value>${basedir}/target/test-classes/ibm.security</value>
+ <name>${extra.surefire.syspropery.name}</name>
+
<value>${extra.surefire.syspropery.value}</value>
</property>
+
<property>
<!-- If we close the port after a client in
the same JVM has opened a keep-alive
connection, on some Linux's, the socket
remains consumed until
Modified: cxf/branches/2.2.x-fixes/rt/ws/security/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/pom.xml?rev=808495&r1=808494&r2=808495&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/pom.xml Thu Aug 27 16:23:37 2009
@@ -190,6 +190,10 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <properties>
+
<extra.surefire.syspropery.name>java.security.properties</extra.surefire.syspropery.name>
+
<extra.surefire.syspropery.value>${basedir}/target/test-classes/ibm.security</extra.surefire.syspropery.value>
+ </properties>
</profile>
</profiles>
