Author: ay
Date: Thu Jun 14 09:16:12 2012
New Revision: 1350142
URL: http://svn.apache.org/viewvc?rev=1350142&view=rev
Log:
Merged revisions 1350141 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1350141 | ay | 2012-06-14 11:14:12 +0200 (Thu, 14 Jun 2012) | 1 line
reverting part of schema update for compatibility (CXF-4362)
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 14 09:16:12 2012
@@ -1 +1 @@
-/cxf/trunk:1-1348209,1348845,1348862,1348866,1349016,1349264,1349307,1349406,1349549,1349714-1349717,1349723,1349825,1350114
+/cxf/trunk:1-1348209,1348845,1348862,1348866,1349016,1349264,1349307,1349406,1349549,1349714-1349717,1349723,1349825,1350114,1350141
Modified:
cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd?rev=1350142&r1=1350141&r2=1350142&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
(original)
+++
cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
Thu Jun 14 09:16:12 2012
@@ -192,7 +192,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="initialReconnectDelay" type="xs:long"
default="60000">
+ <xs:attribute name="initialReconnectDelay" type="xs:long">
<xs:annotation>
<xs:documentation>
The initialy delay before attempting to reconnect to the
database. The subsequent
@@ -200,7 +200,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="maxReconnectAttempts" type="xs:int" default="10">
+ <xs:attribute name="maxReconnectAttempts" type="xs:int">
<xs:annotation>
<xs:documentation>
The maximum number of attemps taken to reconnect to the
database after a connection error.
