[jboss-cvs] JBossAS SVN: r80376 - in projects/metadata/trunk/src/main: java/org/jboss/metadata/javaee/jboss and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 3 07:48:22 EST 2008
Author: alex.loubyansky at jboss.com
Date: 2008-11-03 07:48:21 -0500 (Mon, 03 Nov 2008)
New Revision: 80376
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/IgnoreDependencyMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionMetaData.java
projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
Log:
JBMETA-139 service-beanType (removed dependency-ignored, ignore-dependency should be used instead)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java 2008-11-03 12:40:53 UTC (rev 80375)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java 2008-11-03 12:48:21 UTC (rev 80376)
@@ -31,9 +31,12 @@
*/
@XmlType(name="service-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "businessLocals", "businessRemotes",
"ejbClass", "jndiEnvironmentRefsGroup", "securityIdentity", "objectName", "management", "xmbean", "localBindings",
- "remoteBindings",
- "jndiName", "localJndiName", "jndiBindingPolicy", "securityDomain", "methodAttributes", "depends", "annotations",
- "ignoreDependency", "aopDomainName", "jndiRefs"})
+ "remoteBindings", "jndiName", "homeJndiName", "callByValue",
+ "exceptionOnRollback", "timerPersistence", "configurationName", "invokerBindings", "securityProxy", "localJndiName",
+ "jndiBindingPolicy", "clustered",
+ "clusterConfig", "securityDomain", "methodAttributes", "depends", "annotations",
+ "ignoreDependency", "aopDomainName", "cacheConfig", "poolConfig", "concurrent", "jndiRefs", "portComponent",
+ "ejbTimeoutIdentity", "iorSecurityConfig"})
public class JBossServiceBeanMetaData extends JBossSessionBeanMetaData
{
private static final long serialVersionUID = 1L;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/IgnoreDependencyMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/IgnoreDependencyMetaData.java 2008-11-03 12:40:53 UTC (rev 80375)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/IgnoreDependencyMetaData.java 2008-11-03 12:48:21 UTC (rev 80376)
@@ -36,7 +36,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="ignore-dependencyType")
+ at XmlType(name="ignore-dependencyType", propOrder={"descriptions", "injectionTargets"})
public class IgnoreDependencyMetaData extends IdMetaDataImplWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionMetaData.java 2008-11-03 12:40:53 UTC (rev 80375)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionMetaData.java 2008-11-03 12:48:21 UTC (rev 80376)
@@ -180,6 +180,7 @@
*
* @return true when the dependency is ignored
*/
+ @XmlTransient
public boolean isDependencyIgnored()
{
return ignoreDependency != null;
Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2008-11-03 12:40:53 UTC (rev 80375)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2008-11-03 12:48:21 UTC (rev 80376)
@@ -68,7 +68,8 @@
</xsd:annotation>
<xsd:import namespace="http://java.sun.com/xml/ns/javaee" schemaLocation="ejb-jar_3_0.xsd"/>
-
+
+
<!-- **************************************************** -->
<xsd:element name="jboss" type="jboss:jbossType">
@@ -830,13 +831,8 @@
<xsd:group ref="jboss:descriptionGroup"/>
<xsd:element name="ejb-name" type="javaee:ejb-nameType"/>
<xsd:element name="mapped-name" type="javaee:xsdStringType" minOccurs="0"/>
- <!-- A service bean can't have an EJB 2.1 view -->
- <xsd:element name="business-local"
- type="javaee:fully-qualified-classType" minOccurs="0"
- maxOccurs="unbounded" />
- <xsd:element name="business-remote"
- type="javaee:fully-qualified-classType" minOccurs="0"
- maxOccurs="unbounded" />
+ <xsd:element name="business-local" type="javaee:fully-qualified-classType" minOccurs="0" maxOccurs="unbounded" />
+ <xsd:element name="business-remote" type="javaee:fully-qualified-classType" minOccurs="0" maxOccurs="unbounded" />
<!-- TODO: service-endpoint? -->
<xsd:element name="ejb-class" type="javaee:ejb-classType" minOccurs="0"/>
<!-- Is a service bean really a session bean with a session-type? -->
@@ -856,15 +852,30 @@
<xsd:element name="local-binding" type="jboss:local-bindingType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="remote-binding" type="jboss:remote-bindingType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
+ <xsd:element name="home-jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
+ <xsd:element name="call-by-value" type="xsd:boolean" minOccurs="0"/>
+ <xsd:element name="exception-on-rollback" type="xsd:boolean" minOccurs="0"/>
+ <xsd:element name="timer-persistence" type="xsd:boolean" minOccurs="0"/>
+ <xsd:element name="configuration-name" type="javaee:string" minOccurs="0"/>
+ <xsd:element name="invoker-bindings" type="jboss:invoker-bindingsType" minOccurs="0"/>
+ <xsd:element name="security-proxy" type="javaee:string" minOccurs="0"/>
<xsd:element name="local-jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
<xsd:element name="jndi-binding-policy" type="jboss:jndi-binding-policyType" minOccurs="0"/>
+ <xsd:element name="clustered" type="jboss:clusteredType" minOccurs="0"/>
+ <xsd:element name="cluster-config" type="jboss:cluster-configType" minOccurs="0"/>
<xsd:element name="security-domain" type="javaee:xsdStringType" minOccurs="0"/>
<xsd:element name="method-attributes" type="jboss:method-attributesType" minOccurs="0"/>
<xsd:element name="depends" type="javaee:xsdStringType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="annotation" type="jboss:annotationType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="ignore-dependency" type="jboss:ignore-dependencyType" minOccurs="0"/>
<xsd:element name="aop-domain-name" type="jboss:aop-domain-nameType" minOccurs="0"/>
+ <xsd:element name="cache-config" type="jboss:cache-configType" minOccurs="0"/>
+ <xsd:element name="pool-config" type="jboss:pool-configType" minOccurs="0"/>
+ <xsd:element name="concurrent" type="jboss:concurrentType" minOccurs="0"/>
<xsd:element name="jndi-ref" type="jboss:jndi-refType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="port-component" type="jboss:port-componentType" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="ejb-timeout-identity" type="jboss:security-identityType" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="ior-security-config" type="jboss:ior-security-configType" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
More information about the jboss-cvs-commits
mailing list