SF.net SVN: moduleforge:[2302] controltier/branches/controltier-3-6-support /elements/modules/JBossServer/type.xml

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

Revision: 2302
http://moduleforge.svn.sourceforge.net/moduleforge/?rev=2302&view=rev
Author: connary_scott
Date: 2011-09-14 02:01:27 +0000 (Wed, 14 Sep 2011)
Log Message:
-----------
Fixed bug #3408380, https://sourceforge.net/tracker/?func=detail&atid=779847&aid=3408380&group_id=151079
and contains similar fix applied to AtgJBossServer module in the atg solution library.

Modified Paths:
--------------
controltier/branches/controltier-3-6-support/elements/modules/JBossServer/type.xml

Modified: controltier/branches/controltier-3-6-support/elements/modules/JBossServer/type.xml
===================================================================
--- controltier/branches/controltier-3-6-support/elements/modules/JBossServer/type.xml 2011-09-13 03:20:36 UTC (rev 2301)
+++ controltier/branches/controltier-3-6-support/elements/modules/JBossServer/type.xml 2011-09-14 02:01:27 UTC (rev 2302)
@@ -938,12 +938,73 @@
<property prefix="@{dtype}.@{dname}.@{stype}.@{sname}" file="${entity.instance.dir}/var/@{dtype}.@{dname}.@{stype}.@{sname}.properties"/>
</else>
</if>
- <fail unless="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbSchemaType">entity.attribute.rdbSchemaType not defined for schema @{sname}</fail>
- <fail unless="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbDataSourceName">entity.attribute.rdbDataSourceName not defined for schema @{sname}</fail>
- <fail unless="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbSchemaUserName">entity.attribute.rdbSchemaUserName not defined for schema @{sname}</fail>
- <fail unless="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbSchemaPassword">entity.attribute.rdbSchemaPassword 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.rdbSchemaType not defined for schema @{sname} or is empty">
+ <condition>
+ <or>
+ <not>
+ <isset property="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbSchemaType"/>
+ </not>
+ <equals arg1="${@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbSchemaType}" arg2=""/>
+ </or>
+ </condition>
+ </fail>
+
+ <fail message="entity.attribute.rdbDataSourceName not defined for schema @{sname} or is empty">
+ <condition>
+ <or>
+ <not>
+ <isset property="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbDataSourceName"/>
+ </not>
+ <equals arg1="${@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbDataSourceName}" arg2=""/>
+ </or>
+ </condition>
+ </fail>
+
+ <fail message="entity.attribute.rdbSchemaUserName not defined for schema @{sname} or is empty">
+ <condition>
+ <or>
+ <not>
+ <isset property="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbSchemaUserName"/>
+ </not>
+ <equals arg1="${@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbSchemaUserName}" arg2=""/>
+ </or>
+ </condition>
+ </fail>
+
+ <fail message="entity.attribute.rdbSchemaPassword not defined for schema @{sname} or is empty">
+ <condition>
+ <or>
+ <not>
+ <isset property="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbSchemaPassword"/>
+ </not>
+ <equals arg1="${@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbSchemaPassword}" 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>
+
<var name="filter.rdbSchemaTransactionIsolation" value=""/>
<if>
<isset property="@{dtype}.@{dname}.@{stype}.@{sname}.entity.attribute.rdbSchemaTransactionIsolation"/>
@@ -971,6 +1032,9 @@
<fail unless="@{dtype}.@{dname}.entity.attribute.rdbDriver">attribute entity.attribute.rdbDriver 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}).service\.([^\.]*Rdb[^\.]*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.