You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/01/26 20:39:13 UTC
svn commit: r903384 - in /cxf/trunk: parent/pom.xml rt/ws/security/pom.xml
rt/ws/security/src/test/resources/ibm.security
Author: dkulp
Date: Tue Jan 26 19:39:12 2010
New Revision: 903384
URL: http://svn.apache.org/viewvc?rev=903384&view=rev
Log:
Cleanup setting sysargs for surefire 2.5
Removed:
cxf/trunk/rt/ws/security/src/test/resources/ibm.security
Modified:
cxf/trunk/parent/pom.xml
cxf/trunk/rt/ws/security/pom.xml
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=903384&r1=903383&r2=903384&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue Jan 26 19:39:12 2010
@@ -39,8 +39,6 @@
<surefire.parallel.mode/>
<surefire.fork.vmargs>-ea</surefire.fork.vmargs>
<server.launcher.vmargs>-ea</server.launcher.vmargs>
- <surefire.extra.sysprop.name1>None</surefire.extra.sysprop.name1>
- <surefire.extra.sysprop.value1>None</surefire.extra.sysprop.value1>
<compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
<compile.show.deprecation>true</compile.show.deprecation>
@@ -77,9 +75,6 @@
<pmd.eclipse.ruleset>cxf-pmd-ruleset.xml</pmd.eclipse.ruleset>
- <extra.surefire.syspropery.name>None</extra.surefire.syspropery.name>
- <extra.surefire.syspropery.value>None</extra.surefire.syspropery.value>
-
<resources.base.path/>
</properties>
@@ -272,52 +267,19 @@
<childDelegation>false</childDelegation>
<argLine>${surefire.fork.vmargs}</argLine>
<parallel>${surefire.parallel.mode}</parallel>
- <systemProperties>
- <property>
- <name>${surefire.extra.sysprop.name1}</name>
- <name>${surefire.extra.sysprop.value1}</name>
- </property>
- <property>
- <name>cxf.validateServiceSchemas</name>
- <value>${cxf.validateServices}</value>
- </property>
- <property>
- <name>java.awt.headless</name>
- <value>${java.awt.headless}</value>
- </property>
- <property>
- <name>java.util.logging.config.file</name>
- <value>${basedir}/target/test-classes/logging.properties</value>
- </property>
- <property>
- <name>activemq.store.dir</name>
- <value>${basedir}/target/ActiveMQ</value>
- </property>
- <property>
- <name>derby.system.home</name>
- <value>${basedir}/target/derby</value>
- </property>
- <property>
- <name>spring.validation.mode</name>
- <value>${spring.validation.mode}</value>
- </property>
- <property>
- <name>server.launcher.vmargs</name>
- <value>${server.launcher.vmargs}</value>
- </property>
- <property>
- <name>${extra.surefire.syspropery.name}</name>
- <value>${extra.surefire.syspropery.value}</value>
- </property>
-
- <property>
+ <systemPropertyVariables>
+ <cxf.validateServiceSchemas>${cxf.validateServices}</cxf.validateServiceSchemas>
+ <java.awt.headless>${java.awt.headless}</java.awt.headless>
+ <java.util.logging.config.file>${basedir}/target/test-classes/logging.properties</java.util.logging.config.file>
+ <activemq.store.dir>${basedir}/target/ActiveMQ</activemq.store.dir>
+ <derby.system.home>${basedir}/target/derby</derby.system.home>
+ <spring.validation.mode>${spring.validation.mode}</spring.validation.mode>
+ <server.launcher.vmargs>${server.launcher.vmargs}</server.launcher.vmargs>
<!-- 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
some timeout occurs. That may cause some tests to timeout/hang. -->
- <name>org.apache.cxf.transports.http_jetty.DontClosePort</name>
- <value>false</value>
- </property>
- </systemProperties>
+ <org.apache.cxf.transports.http_jetty.DontClosePort>false</org.apache.cxf.transports.http_jetty.DontClosePort>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
@@ -1379,22 +1341,6 @@
<artifactId>xalan</artifactId>
</dependency>
</dependencies>
- <properties>
- <!--
- The default xalan TransformerFactory on the
- ibm jdk seems to be
- org.apache.xalan.processor.TransformerFactoryImpl
- which seems to have an issue causing it to
- add things like duplicate default namespace
- declarations. woodstox doesn't like that.
- So set this property to use the xsltc
- TransformerFactory which behaves better with
- woodstox (and which the sun jdk seems to
- default to).
- -->
- <surefire.extra.sysprop.name1>javax.xml.transform.TransformerFactory</surefire.extra.sysprop.name1>
- <surefire.extra.sysprop.value1>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</surefire.extra.sysprop.value1>
- </properties>
<build>
<plugins>
<plugin>
Modified: cxf/trunk/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/pom.xml?rev=903384&r1=903383&r2=903384&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/pom.xml (original)
+++ cxf/trunk/rt/ws/security/pom.xml Tue Jan 26 19:39:12 2010
@@ -192,10 +192,6 @@
<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>