duplicate jndi-name in jboss_5_0.xsd

[starksm64]

There is a conflict in the current use of the jndi-name from ejb-local-refType and ejb-refTypes because they define both a jndi-name element, and refer to the jboss:resourceGroup:

 <xsd:complexType name="ejb-local-refType">
 <xsd:sequence>
 <xsd:element name="description" type="javaee:descriptionType" minOccurs="0"
 maxOccurs="unbounded"/>
 <xsd:element name="ejb-ref-name" type="javaee:ejb-ref-nameType" minOccurs="0"/>
...
 <xsd:group ref="jboss:resourceGroup"/>
 <xsd:element name="jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
 </xsd:sequence>

...
 <!-- Bring resourceGroup into jboss namespace -->
 <xsd:group name="resourceGroup">
 <xsd:sequence>
 <!-- In jboss xml we allow the use of jndi-name instead of mapped-name -->
 <xsd:choice>
 <xsd:element name="jndi-name" type="javaee:jndi-nameType"
 minOccurs="0" />
 <xsd:element name="mapped-name" type="javaee:xsdStringType"
 minOccurs="0" />
 </xsd:choice>

It looks like the jndi-name should just be dropped and just the jboss:resourceGroup used.

By the way, I use the http://www.oxygenxml.com/ plugin for eclipse that allows for validation and navigation of schemas very easily within the project if your looking for a good xml/xsd tool.

[wolfc]

My bad, the jndi-name in jboss:resourceGroup is the good one.
Leaves only the question whether jndi-name deprecates mapped-name or should be treated as a separate element?

[wolfc]

I'm working out an alternative assertJndiName where a mode argument can be passed. This way we can still make sure that a jndi-name overrides a mapped-name.

[wolfc]

Bugrit, in the end it still gets to convoluted, so I'm not going to override your fix. I've committed the mode construct though, it might be useful in the future.