SF.net SVN: moduleforge:[2301] controltier/branches/controltier-3-6-support /atg/modules/AtgJBossServer/commands/configureDataSources.xml

[connar...@users.sourceforge.net]

Revision: 2301
http://moduleforge.svn.sourceforge.net/moduleforge/?rev=2301&view=rev
Author: connary_scott
Date: 2011-09-13 03:20:36 +0000 (Tue, 13 Sep 2011)
Log Message:
-----------
fixed bug id: 3408380

https://sourceforge.net/tracker/?func=detail&aid=3408380&group_id=151079&atid=779847

which now has checks for empty data fields and implements apply-macro errorhandler which was missing.
This led to java forked call failures not being caught.

Modified Paths:
--------------
controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/commands/configureDataSources.xml

Modified: controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/commands/configureDataSources.xml
===================================================================
--- controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/commands/configureDataSources.xml 2011-08-15 23:56:45 UTC (rev 2300)
+++ controltier/branches/controltier-3-6-support/atg/modules/AtgJBossServer/commands/configureDataSources.xml 2011-09-13 03:20:36 UTC (rev 2301)
@@ -147,11 +147,62 @@
<context direction="internal" proximity="1" entityName="@{sname}" entityClass="@{stype}"/>
</get-properties>
<property prefix="@{dtype}.@{dname}.@{stype}.@{sname}" file="${entity.instance.dir}/var/@{dtype}.@{dname}.@{stype}.@{sname}.properties"/>
- <fail unless="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.atgRdbDataSourceName">entity.attribute.atgRdbDataSourceName not defined for schema @{sname}</fail>
- <fail unless="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.atgRdbSchemaUserName">entity.attribute.atgRdbSchemaUserName not defined for schema @{sname}</fail>
- <fail unless="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.atgRdbSchemaPassword">entity.attribute.atgRdbSchemaPassword not defined for schema @{sname}</fail>
- <fail unless="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbMinPoolSize">entity.attribute.rdbMinPoolSize not defined for schema @{sname}</fail>
- <fail unless="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbMaxPoolSize">entity.attribute.rdbMaxPoolSize not defined for schema @{sname}</fail>
+
+ <fail message="entity.attribute.atgRdbDataSourceName not defined for schema @{sname} or is empty">
+ <condition>
+ <or>
+ <not>
+ <isset property="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.atgRdbDataSourceName"/>
+ </not>
+ <equals arg1="${@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.atgRdbDataSourceName}" arg2=""/>
+ </or>
+ </condition>
+ </fail>
+
+ <fail message="entity.attribute.atgRdbSchemaUserName not defined for schema @{sname} or is empty">
+ <condition>
+ <or>
+ <not>
+ <isset property="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.atgRdbSchemaUserName"/>
+ </not>
+ <equals arg1="${@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.atgRdbSchemaUserName}" arg2=""/>
+ </or>
+ </condition>
+ </fail>
+
+ <fail message="entity.attribute.atgRdbSchemaPassword not defined for schema @{sname} or is empty">
+ <condition>
+ <or>
+ <not>
+ <isset property="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.atgRdbSchemaPassword"/>
+ </not>
+ <equals arg1="${@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.atgRdbSchemaPassword}" arg2=""/>
+ </or>
+ </condition>
+ </fail>
+
+ <fail message="entity.attribute.rdbMinPoolSize not defined for schema @{sname} or is empty">
+ <condition>
+ <or>
+ <not>
+ <isset property="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbMinPoolSize"/>
+ </not>
+ <equals arg1="${@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbMinPoolSize}" arg2=""/>
+ </or>
+ </condition>
+ </fail>
+
+ <fail message="entity.attribute.rdbMaxPoolSize not defined for schema @{sname} or is empty">
+ <condition>
+ <or>
+ <not>
+ <isset property="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbMaxPoolSize"/>
+ </not>
+ <equals arg1="${@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbMaxPoolSize}" arg2=""/>
+ </or>
+ </condition>
+ </fail>
+
<local name="filter.transactionisolation"/>
<condition property="filter.transactionisolation" value="${@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbSchemaTransactionIsolation}" else="">
<isset property="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbSchemaTransactionIsolation"/>
@@ -168,6 +219,9 @@
<fail unless="@{dtype}.@{dname}.entity.attribute.atgRdbDriver">attribute entity.attribute.atgRdbDriver not defined for db @{dname}</fail>
<tempfile property="datasource.content.temp" destDir="${entity.instance.dir}/var"/>
<apply-macro macro="processRdbSchemas">
+ <errorhandler>
+ <fail/>
+ </errorhandler>
<propertiesquery id="rdbs.query" select="dtype,dname,stype,sname" from="^(@{dtype}).(@{dname}).deployment\.(Atg[^\.]+Schema)\.(.*)\.startup-rank$">
<sortby>
<select by="value" order="ascending"/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.