Author: veithen
Date: Mon Jun 7 21:14:02 2010
New Revision: 952442
URL: http://svn.apache.org/viewvc?rev=952442&view=rev
Log:
Merged r771051 to the 1.5 branch to make the build less painful on Mac OS X.
Modified:
axis/axis2/java/core/branches/java/1_5/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/jaxws-integration/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/saaj/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 7 21:14:02 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,801630
+/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,801630
Modified: axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml?rev=952442&r1=952441&r2=952442&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml Mon Jun
7 21:14:02 2010
@@ -348,6 +348,11 @@
<name>build.repository</name>
<value>./target/test-classes</value>
</property>
+ <!-- Prevent Mac OS X from showing an icon in
the dock during the test run -->
+ <property>
+ <name>java.awt.headless</name>
+ <value>true</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
@@ -394,6 +399,11 @@
<name>build.repository</name>
<value>./target/test-classes</value>
</property>
+ <!-- Prevent Mac OS X from showing an icon in
the dock during the test run -->
+ <property>
+ <name>java.awt.headless</name>
+ <value>true</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/jaxws-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/jaxws-integration/pom.xml?rev=952442&r1=952441&r2=952442&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/jaxws-integration/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/jaxws-integration/pom.xml
Mon Jun 7 21:14:02 2010
@@ -1436,6 +1436,11 @@
<name>org.apache.axis2.jaxws.repo.path</name>
<value>./target/client-repo</value>
</property>
+ <!-- Prevent Mac OS X from showing an icon in the dock
during the test run -->
+ <property>
+ <name>java.awt.headless</name>
+ <value>true</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
Modified: axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml?rev=952442&r1=952441&r2=952442&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml Mon Jun 7
21:14:02 2010
@@ -317,6 +317,11 @@
<name>org.apache.axis2.jaxws.repo.path</name>
<value>./target/repository</value>
</property>
+ <!-- Prevent Mac OS X from showing an icon in the dock
during the test run -->
+ <property>
+ <name>java.awt.headless</name>
+ <value>true</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 7 21:14:02 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,801630
+/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,801630
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 7 21:14:02 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,801630
+/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,801630
Modified: axis/axis2/java/core/branches/java/1_5/modules/saaj/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/saaj/pom.xml?rev=952442&r1=952441&r2=952442&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/saaj/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/saaj/pom.xml Mon Jun 7
21:14:02 2010
@@ -156,6 +156,13 @@
<value>org.apache.axis2.saaj.SAAJMetaFactoryImpl</value>
</property>
</systemProperties>
+ <systemProperties>
+ <!-- Prevent Mac OS X from showing an icon in the dock
during the test run -->
+ <property>
+ <name>java.awt.headless</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
</configuration>
</plugin>
</plugins>
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 7 21:14:02 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/transport/http/pom.xml:801630
+/webservices/axis2/trunk/java/modules/transport/http/pom.xml:771051,801630
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 7 21:14:02 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/transport/http/src:801630
+/webservices/axis2/trunk/java/modules/transport/http/src:771051,801630
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 7 21:14:02 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/transport/local:801630
+/webservices/axis2/trunk/java/modules/transport/local:771051,801630
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 7 21:14:02 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709,801630
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709,771051,801630
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 7 21:14:02 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,801630
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,771051,801630
