svn commit: r1234015 - in /ofbiz/trunk/framework/entity: dtd/entity-config.xsd src/org/ofbiz/entity/config/EntityConfigUtil.java

Author: jleroux
Date: Fri Jan 20 17:21:41 2012
New Revision: 1234015

URL: http://svn.apache.org/viewvc?rev=1234015&view=rev
Log:
Closes OFBIZ-4663 ERROR in log file when starting OFBiz, debug-xa-resources is commented in entityengine.xml

Oops... forgot the other files in previous commit

Modified:
    ofbiz/trunk/framework/entity/dtd/entity-config.xsd
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/config/EntityConfigUtil.java

Modified: ofbiz/trunk/framework/entity/dtd/entity-config.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/dtd/entity-config.xsd?rev=1234015&r1=1234014&r2=1234015&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/dtd/entity-config.xsd (original)
+++ ofbiz/trunk/framework/entity/dtd/entity-config.xsd Fri Jan 20 17:21:41 2012
@@ -82,13 +82,16 @@ under the License.
             <xs:attributeGroup ref="attlist.connection-factory"/>
         </xs:complexType>
     </xs:element>
+    <xs:attributeGroup name="attlist.connection-factory">
+        <xs:attribute type="xs:string" name="class" use="required"/>
+    </xs:attributeGroup>
     <xs:element name="debug-xa-resources">
         <xs:complexType>
-            <xs:attribute default="false"  name="value" type="xs:boolean"/>
+            <xs:attributeGroup ref="attlist.debug-xa-resources"/>
         </xs:complexType>
     </xs:element>
-    <xs:attributeGroup name="attlist.connection-factory">
-        <xs:attribute type="xs:string" name="class" use="required"/>
+    <xs:attributeGroup name="attlist.debug-xa-resources">
+        <xs:attribute type="xs:string" name="value" use="required"/>
     </xs:attributeGroup>
     <xs:element name="delegator">
         <xs:complexType>

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/config/EntityConfigUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/config/EntityConfigUtil.java?rev=1234015&r1=1234014&r2=1234015&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/config/EntityConfigUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/config/EntityConfigUtil.java Fri Jan 20 17:21:41 2012
@@ -127,7 +127,7 @@ public class EntityConfigUtil {
         connFactoryClass = connectionFactoryElement.getAttribute("class");
 
         Element debugXaResourcesElement = UtilXml.firstChildElement(rootElement, "debug-xa-resources");
-        if (debugXaResourcesElement == null) {
+        if (debugXaResourcesElement == null) { // This should not be since debug-xa-resources is required, but safer...
             debugXAResources = false;
         } else {
             debugXAResources = "true".equals(debugXaResourcesElement.getAttribute("value"));