[jboss-cvs] JBossAS SVN: r86963 - in projects/metadata/trunk/src: main/resources/schema and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 8 09:12:32 EDT 2009
Author: alex.loubyansky at jboss.com
Date: 2009-04-08 09:12:31 -0400 (Wed, 08 Apr 2009)
New Revision: 86963
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MessageDrivenBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50SessionBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ConsumerBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51GenericBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51MessageDrivenBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ServiceBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51SessionBeanMetaData.java
Removed:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanJBoss50MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanJBoss50MetaData.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java
projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/JBoss51XSDBindingUnitTestCase.java
Log:
JBMETA-186
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MessageDrivenBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MessageDrivenBeanMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MessageDrivenBeanMetaData.java 2009-04-08 13:12:31 UTC (rev 86963)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.ejb.jboss;
+
+/**
+ * A JBossMessageDrivenBeanJBoss50MetaData.
+ *
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+public class JBoss50MessageDrivenBeanMetaData extends JBossMessageDrivenBeanMetaData
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 7103348979383633314L;
+}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java 2009-04-08 12:50:45 UTC (rev 86962)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java 2009-04-08 13:12:31 UTC (rev 86963)
@@ -77,8 +77,8 @@
@Override
@XmlElementWrapper(name="enterprise-beans")
@XmlElements({
- @XmlElement(name="session", type=JBossSessionBeanJBoss50MetaData.class),
- @XmlElement(name="message-driven", type=JBossMessageDrivenBeanJBoss50MetaData.class),
+ @XmlElement(name="session", type=JBoss50SessionBeanMetaData.class),
+ @XmlElement(name="message-driven", type=JBoss50MessageDrivenBeanMetaData.class),
@XmlElement(name="consumer", type=JBossConsumerBeanMetaData.class),
@XmlElement(name="ejb", type=JBossGenericBeanMetaData.class),
@XmlElement(name="service", type=JBossServiceBeanMetaData.class)
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50SessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50SessionBeanMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50SessionBeanMetaData.java 2009-04-08 13:12:31 UTC (rev 86963)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.ejb.jboss;
+
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * A JBossSessionBeanJBoss50MetaData.
+ *
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+ at XmlType(name="session-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "environmentRefsGroup",
+ "securityIdentity", "localBindings", "remoteBindings", "businessLocals", "businessRemotes",
+ "jndiName", "homeJndiName", "callByValue",
+ "exceptionOnRollback", "timerPersistence", "configurationName", "invokerBindings", "securityProxy", "localJndiName",
+ "localHomeJndiName", "jndiBindingPolicy", "clustered", "clusterConfig",
+ "securityDomain", "methodAttributes", "depends", "annotations", "ignoreDependency", "aopDomainName",
+ "cacheConfig", "poolConfig", "concurrent", "jndiRefs", "portComponent", "ejbTimeoutIdentity", "iorSecurityConfig"})
+public class JBoss50SessionBeanMetaData extends JBossSessionBeanMetaData
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 29928077451682118L;
+}
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ConsumerBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ConsumerBeanMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ConsumerBeanMetaData.java 2009-04-08 13:12:31 UTC (rev 86963)
@@ -0,0 +1,300 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.ejb.jboss;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.spec.ActivationConfigMetaData;
+
+/**
+ * An EJB 3 consumer bean.
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version <tt>$Revision: 84989 $</tt>
+ */
+ at XmlType(name="consumer-beanType", propOrder={"descriptionGroup", "ejbName", "ejbClass", "messageDestination",
+ "messageDestinationType", "producers", "localProducers", "currentMessage", "messageProperties",
+ "environmentRefsGroup", "securityDomain", "methodAttributes", "depends",
+ "annotations", "ignoreDependency", "aopDomainName", "poolConfig", "jndiRefs", "activationConfig"})
+public class JBoss51ConsumerBeanMetaData extends JBossEnterpriseBeanMetaData
+{
+ private static final long serialVersionUID = 1L;
+
+ @SuppressWarnings("unused")
+ private static final Logger log = Logger.getLogger(JBoss51ConsumerBeanMetaData.class);
+
+ /** The activation config */
+ private ActivationConfigMetaData activationConfig;
+
+ /** The destiation. */
+ private String destination = null;
+
+ /** The destination type. */
+ private String destinationType = null;
+
+ /** The current message. */
+ private MethodAttributesMetaData currentMessage = null;
+
+ /** The message properties. */
+ private List<MessagePropertiesMetaData> messageProperties = null;
+
+ /** The producers. */
+ private List<ProducerMetaData> producers = null;
+
+ /** The local producers. */
+ private List<LocalProducerMetaData> localProducers = null;
+
+ /** The default activation config. */
+ private ActivationConfigMetaData defaultActivationConfig;
+
+ public ActivationConfigMetaData getActivationConfig()
+ {
+ return activationConfig;
+ }
+
+ public void setActivationConfig(ActivationConfigMetaData activationConfig)
+ {
+ if (activationConfig == null)
+ throw new IllegalArgumentException("Null activationConfig");
+ this.activationConfig = activationConfig;
+ }
+
+ public String getMessageDestination()
+ {
+ return destination;
+ }
+
+ public void setMessageDestination(String destination)
+ {
+ this.destination = destination;
+ }
+
+ public String getMessageDestinationType()
+ {
+ return destinationType;
+ }
+
+ public void setMessageDestinationType(String destinationType)
+ {
+ this.destinationType = destinationType;
+ }
+
+ public MethodAttributesMetaData getCurrentMessage()
+ {
+ return currentMessage;
+ }
+
+ public void setCurrentMessage(MethodAttributesMetaData currentMessage)
+ {
+ this.currentMessage = currentMessage;
+ }
+
+ public List<MessagePropertiesMetaData> getMessageProperties()
+ {
+ return messageProperties;
+ }
+
+ public void setMessageProperties(List<MessagePropertiesMetaData> messageProperties)
+ {
+ this.messageProperties = messageProperties;
+ }
+
+ public List<ProducerMetaData> getProducers()
+ {
+ return producers;
+ }
+
+ @XmlElement(name="producer", required=false)
+ public void setProducers(List<ProducerMetaData> producers)
+ {
+ this.producers = producers;
+ }
+
+ public List<LocalProducerMetaData> getLocalProducers()
+ {
+ return localProducers;
+ }
+
+ @XmlElement(name="local-producer", required=false)
+ public void setLocalProducers(List<LocalProducerMetaData> producers)
+ {
+ this.localProducers = producers;
+ }
+
+ public ActivationConfigMetaData getDefaultActivationConfig()
+ {
+ return defaultActivationConfig;
+ }
+
+ public void setDefaultActivationConfig(ActivationConfigMetaData defaultActivationConfig)
+ {
+ if (defaultActivationConfig == null)
+ throw new IllegalArgumentException("Null defaultActivationConfig");
+ this.defaultActivationConfig = defaultActivationConfig;
+ }
+
+ @Override
+ @XmlElement(name="jndi-name")
+ public String getMappedName()
+ {
+ return super.getMappedName();
+ }
+
+ @Override
+ public boolean isConsumer()
+ {
+ return true;
+ }
+
+ public String toString()
+ {
+ StringBuffer sb = new StringBuffer(100);
+ sb.append("[Consumer:");
+ sb.append(super.toString());
+ sb.append(", destination=" + destination);
+ sb.append(", destinationType=" + destinationType);
+ sb.append(']');
+ return sb.toString();
+ }
+
+ @Override
+ public String getDefaultConfigurationName()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ @Override
+ protected String getDefaultInvokerName()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ /**
+ * @deprecated JBMTEA-68
+ */
+ @Override
+ @Deprecated
+ public String determineJndiName()
+ {
+ return null;
+ }
+
+ public void merge(JBossEnterpriseBeanMetaData overrideEjb, JBossEnterpriseBeanMetaData originalEjb)
+ {
+ super.merge(overrideEjb, originalEjb);
+
+ List<ProducerMetaData> originalProducers = null;
+ List<LocalProducerMetaData> originalLocalProducers = null;
+ List<MessagePropertiesMetaData> originalMsgProps = null;
+ MethodAttributesMetaData originalMsg = null;
+ JBoss51ConsumerBeanMetaData original = originalEjb instanceof JBossGenericBeanMetaData ? null : (JBoss51ConsumerBeanMetaData) originalEjb;
+ if(original != null)
+ {
+ if(original.destination != null)
+ destination = original.destination;
+ if(original.destinationType != null)
+ destinationType = original.destinationType;
+
+ originalMsg = original.currentMessage;
+ originalMsgProps = original.messageProperties;
+ originalProducers = original.producers;
+ originalLocalProducers = original.localProducers;
+ }
+
+ List<ProducerMetaData> overrideProducers = null;
+ List<LocalProducerMetaData> overrideLocalProducers = null;
+ List<MessagePropertiesMetaData> overrideMsgProps = null;
+ MethodAttributesMetaData overrideMsg = null;
+ JBoss51ConsumerBeanMetaData override = overrideEjb instanceof JBossGenericBeanMetaData ? null : (JBoss51ConsumerBeanMetaData) overrideEjb;
+ if(override != null)
+ {
+ if(override.destination != null)
+ destination = override.destination;
+ if(override.destinationType != null)
+ destinationType = override.destinationType;
+
+ overrideMsg = override.currentMessage;
+ overrideMsg = override.currentMessage;
+ overrideMsgProps = override.messageProperties;
+ overrideProducers = override.producers;
+ overrideLocalProducers = override.localProducers;
+ }
+
+ if((override != null && override.activationConfig != null) || (original != null && original.activationConfig != null))
+ {
+ activationConfig = new ActivationConfigMetaData();
+ activationConfig.merge(override != null ? override.activationConfig : null, original != null ? original.activationConfig : null);
+ }
+
+ if(originalMsg != null || overrideMsg != null)
+ {
+ if(currentMessage == null)
+ currentMessage = new MethodAttributesMetaData();
+ currentMessage.merge(overrideMsg, originalMsg);
+ }
+
+ if(overrideMsgProps != null)
+ {
+ if(messageProperties == null)
+ messageProperties = new ArrayList<MessagePropertiesMetaData>();
+ messageProperties.addAll(overrideMsgProps);
+ }
+ if(originalMsgProps != null)
+ {
+ if(messageProperties == null)
+ messageProperties = new ArrayList<MessagePropertiesMetaData>();
+ messageProperties.addAll(originalMsgProps);
+ }
+
+ if(overrideProducers != null)
+ {
+ if(producers == null)
+ producers = new ArrayList<ProducerMetaData>();
+ producers.addAll(overrideProducers);
+ }
+ if(originalProducers != null)
+ {
+ if(producers == null)
+ producers = new ArrayList<ProducerMetaData>();
+ producers.addAll(originalProducers);
+ }
+
+ if(overrideLocalProducers != null)
+ {
+ if(localProducers == null)
+ localProducers = new ArrayList<LocalProducerMetaData>();
+ localProducers.addAll(overrideLocalProducers);
+ }
+ if(originalLocalProducers != null)
+ {
+ if(localProducers == null)
+ localProducers = new ArrayList<LocalProducerMetaData>();
+ localProducers.addAll(originalLocalProducers);
+ }
+ }
+}
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51GenericBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51GenericBeanMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51GenericBeanMetaData.java 2009-04-08 13:12:31 UTC (rev 86963)
@@ -0,0 +1,150 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.ejb.jboss;
+
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.PortComponent;
+
+/**
+ * Allow for the specification of an unknown bean type in the deployment
+ * descriptor (EJBTHREE-936).
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: 84989 $
+ */
+ at XmlType(name="generic-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "environmentRefsGroup",
+ "securityIdentity", "jndiName", "homeJndiName", "localJndiName", "localHomeJndiName",
+ "jndiBindingPolicy", "securityDomain", "methodAttributes", "depends", "annotations", "ignoreDependency", "aopDomainName",
+ "poolConfig", "jndiRefs", "portComponent"})
+public class JBoss51GenericBeanMetaData extends JBossEnterpriseBeanMetaData
+{
+ private static final long serialVersionUID = 1L;
+
+ /** The jndi name for the EJB 2 remote home interface */
+ private String homeJndiName;
+
+ /** The jndi name for the EJB 2 local home interface */
+ private String localHomeJndiName;
+
+ /** The webservices port-component */
+ private PortComponent portComponent;
+
+ /* (non-Javadoc)
+ * @see org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData#getDefaultConfigurationName()
+ */
+ @Override
+ public String getDefaultConfigurationName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData#getDefaultInvokerName()
+ */
+ @Override
+ protected String getDefaultInvokerName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * @deprecated JBMETA-68
+ */
+ @Override
+ @Deprecated
+ public String determineJndiName()
+ {
+ return getJndiName();
+ }
+
+ public String getHomeJndiName()
+ {
+ return homeJndiName;
+ }
+
+ public void setHomeJndiName(String s)
+ {
+ this.homeJndiName = s;
+ }
+
+ /**
+ * Get the jndiName.
+ *
+ * @return the jndiName.
+ */
+ public String getJndiName()
+ {
+ return super.getMappedName();
+ }
+
+ /**
+ * Set the jndiName.
+ *
+ * @param jndiName the jndiName.
+ * @throws IllegalArgumentException for a null jndiName
+ */
+ public void setJndiName(String jndiName)
+ {
+ super.setMappedName(jndiName);
+ }
+
+ public String getLocalHomeJndiName()
+ {
+ return localHomeJndiName;
+ }
+
+ public void setLocalHomeJndiName(String s)
+ {
+ this.localHomeJndiName = s;
+ }
+
+ public PortComponent getPortComponent()
+ {
+ return portComponent;
+ }
+
+ public void setPortComponent(PortComponent portComponent)
+ {
+ this.portComponent = portComponent;
+ }
+
+ @Override
+ public boolean isGeneric()
+ {
+ return true;
+ }
+
+ /**
+ * Don't call this method.
+ *
+ * During a merge on JBossEnterpriseBeansMetaData it will translate a JBossGenericBeanMetaData
+ * into the proper wrapper.
+ */
+ @Override
+ public void merge(JBossEnterpriseBeanMetaData override, JBossEnterpriseBeanMetaData original)
+ {
+ throw new RuntimeException("Merging two JBossGenericBeanMetaData objects is not supported, JBossEnterpriseBeansMetaData should have converted them");
+ }
+}
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51MessageDrivenBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51MessageDrivenBeanMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51MessageDrivenBeanMetaData.java 2009-04-08 13:12:31 UTC (rev 86963)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.ejb.jboss;
+
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * A JBossMessageDrivenBeanJBoss50MetaData.
+ *
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+ at XmlType(name="message-driven-beanType", propOrder={"descriptionGroup", "ejbName", "activationConfig", "destinationJndiName",
+ "mdbUser", "mdbPassword", "mdbClientId", "mdbSubscriptionId", "resourceAdapterName",
+ "environmentRefsGroup", "securityIdentity", "securityDomain", "methodAttributes", "depends",
+ "ejbTimeoutIdentity", "annotations", "ignoreDependency", "aopDomainName", "poolConfig",
+ "jndiRefs", "createDestination"})
+public class JBoss51MessageDrivenBeanMetaData extends JBossMessageDrivenBeanMetaData
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 7103348979383633314L;
+}
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51MetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51MetaData.java 2009-04-08 13:12:31 UTC (rev 86963)
@@ -0,0 +1,91 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.metadata.ejb.jboss;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * 5.0 jboss.xml metadata
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+ at XmlRootElement(name="jboss", namespace=JavaEEMetaDataConstants.JBOSS_NS)
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace=JavaEEMetaDataConstants.JBOSS_NS,
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
+ at XmlType(name="jbossType", namespace=JavaEEMetaDataConstants.JBOSS_NS, propOrder={"descriptionGroup", "loaderRepository",
+ "jmxName", "securityDomain", "excludeMissingMethods", "unauthenticatedPrincipal",
+ "jndiBindingPolicy", "jaccContextID", "webservices", "enterpriseBeans", "assemblyDescriptor",
+ "resourceManagers"})
+public class JBoss51MetaData extends JBossMetaData
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1;
+
+ /**
+ * Create a new JBoss50MetaData.
+ */
+ public JBoss51MetaData()
+ {
+ // For serialization
+ }
+
+ @XmlAttribute
+ public void setVersion(String v)
+ {
+ super.setVersion(v);
+ }
+
+ @Override
+ @XmlElementWrapper(name="enterprise-beans")
+ @XmlElements({
+ @XmlElement(name="session", type=JBoss51SessionBeanMetaData.class),
+ @XmlElement(name="message-driven", type=JBoss51MessageDrivenBeanMetaData.class),
+ @XmlElement(name="consumer", type=JBoss51ConsumerBeanMetaData.class),
+ @XmlElement(name="ejb", type=JBoss51GenericBeanMetaData.class),
+ @XmlElement(name="service", type=JBoss51ServiceBeanMetaData.class)
+ })
+ public JBossEnterpriseBeansMetaData getEnterpriseBeans()
+ {
+ return super.getEnterpriseBeans();
+ }
+
+ @Override
+ public void setEnterpriseBeans(JBossEnterpriseBeansMetaData beans)
+ {
+ super.setEnterpriseBeans(beans);
+ }
+}
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ServiceBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ServiceBeanMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ServiceBeanMetaData.java 2009-04-08 13:12:31 UTC (rev 86963)
@@ -0,0 +1,139 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.ejb.jboss;
+
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * An EJB 3 service bean.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: 84989 $
+ */
+ at XmlType(name="service-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "businessLocals", "businessRemotes",
+ "ejbClass", "environmentRefsGroup", "securityIdentity", "objectName", "management", "xmbean", "localBindings",
+ "remoteBindings", "jndiName", "homeJndiName", "localJndiName",
+ "jndiBindingPolicy", "clustered", "clusterConfig", "securityDomain", "methodAttributes", "depends", "annotations",
+ "ignoreDependency", "aopDomainName", "poolConfig", "concurrent", "jndiRefs", "portComponent", "ejbTimeoutIdentity"})
+public class JBoss51ServiceBeanMetaData extends JBossSessionBeanMetaData
+{
+ private static final long serialVersionUID = 1L;
+
+ /** The jndi name where the local proxy is bound */
+ private String localJndiName;
+
+ /** The fully qualified class name for the JMX Management interface */
+ private String management;
+
+ /** The object name under which the management interface is registered into JMX */
+ private String objectName;
+
+ /** The resource url for xmbean metadata */
+ private String xmBean;
+
+ public String getLocalJndiName()
+ {
+ return localJndiName;
+ }
+
+ public String getManagement()
+ {
+ return management;
+ }
+
+ public String getObjectName()
+ {
+ return objectName;
+ }
+
+ public String getXmbean()
+ {
+ return xmBean;
+ }
+
+ @Override
+ public boolean isService()
+ {
+ return true;
+ }
+
+ /**
+ * Although a service bean shares the same metadata
+ * as a session bean, it's not trully a session bean.
+ */
+ @Override
+ public boolean isSession()
+ {
+ return false;
+ }
+
+ public void setLocalJndiName(String localJndiName)
+ {
+ this.localJndiName = localJndiName;
+ }
+
+ public void setManagement(String management)
+ {
+ this.management = management;
+ }
+
+ public void setObjectName(String objectName)
+ {
+ this.objectName = objectName;
+ }
+
+ public void setXmbean(String xmBean)
+ {
+ this.xmBean = xmBean;
+ }
+
+ public void merge(JBossEnterpriseBeanMetaData overrideEjb, JBossEnterpriseBeanMetaData originalEjb)
+ {
+ super.merge(overrideEjb, originalEjb);
+ JBoss51ServiceBeanMetaData override = overrideEjb instanceof JBossGenericBeanMetaData ? null : (JBoss51ServiceBeanMetaData) overrideEjb;
+ JBoss51ServiceBeanMetaData original = originalEjb instanceof JBossGenericBeanMetaData ? null : (JBoss51ServiceBeanMetaData) originalEjb;
+
+ if(original != null)
+ {
+ if(original.localJndiName != null)
+ localJndiName = original.localJndiName;
+ if(original.management != null)
+ management = original.management;
+ if(original.objectName != null)
+ objectName = original.objectName;
+ if(original.xmBean != null)
+ xmBean = original.xmBean;
+ }
+
+ if(override != null)
+ {
+ if(override.localJndiName != null)
+ localJndiName = override.localJndiName;
+ if (override.management != null)
+ management = override.management;
+ if (override.objectName != null)
+ objectName = override.objectName;
+ if (override.xmBean != null)
+ xmBean = override.xmBean;
+ }
+ }
+}
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51SessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51SessionBeanMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51SessionBeanMetaData.java 2009-04-08 13:12:31 UTC (rev 86963)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.ejb.jboss;
+
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * A JBossSessionBeanJBoss50MetaData.
+ *
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+ at XmlType(name="session-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "environmentRefsGroup",
+ "securityIdentity", "localBindings", "remoteBindings", "businessLocals", "businessRemotes",
+ "jndiName", "homeJndiName", "localJndiName", "localHomeJndiName", "jndiBindingPolicy",
+ "clustered", "clusterConfig",
+ "securityDomain", "methodAttributes", "depends", "annotations", "ignoreDependency", "aopDomainName",
+ "cacheConfig", "poolConfig", "concurrent", "jndiRefs", "portComponent", "ejbTimeoutIdentity"})
+public class JBoss51SessionBeanMetaData extends JBossSessionBeanMetaData
+{
+
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 4462016897903509842L;
+}
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanJBoss50MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanJBoss50MetaData.java 2009-04-08 12:50:45 UTC (rev 86962)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanJBoss50MetaData.java 2009-04-08 13:12:31 UTC (rev 86963)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.ejb.jboss;
-
-/**
- * A JBossMessageDrivenBeanJBoss50MetaData.
- *
- * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
- * @version $Revision: 1.1 $
- */
-public class JBossMessageDrivenBeanJBoss50MetaData extends JBossMessageDrivenBeanMetaData
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 7103348979383633314L;
-}
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanJBoss50MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanJBoss50MetaData.java 2009-04-08 12:50:45 UTC (rev 86962)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanJBoss50MetaData.java 2009-04-08 13:12:31 UTC (rev 86963)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.ejb.jboss;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * A JBossSessionBeanJBoss50MetaData.
- *
- * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
- * @version $Revision: 1.1 $
- */
- at XmlType(name="session-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "environmentRefsGroup",
- "securityIdentity", "localBindings", "remoteBindings", "businessLocals", "businessRemotes",
- "jndiName", "homeJndiName", "callByValue",
- "exceptionOnRollback", "timerPersistence", "configurationName", "invokerBindings", "securityProxy", "localJndiName",
- "localHomeJndiName", "jndiBindingPolicy", "clustered", "clusterConfig",
- "securityDomain", "methodAttributes", "depends", "annotations", "ignoreDependency", "aopDomainName",
- "cacheConfig", "poolConfig", "concurrent", "jndiRefs", "portComponent", "ejbTimeoutIdentity", "iorSecurityConfig"})
-public class JBossSessionBeanJBoss50MetaData extends JBossSessionBeanMetaData
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 29928077451682118L;
-}
Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd 2009-04-08 12:50:45 UTC (rev 86962)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd 2009-04-08 13:12:31 UTC (rev 86963)
@@ -102,11 +102,9 @@
<xsd:group ref="jboss:descriptionGroup"/>
<xsd:element name="loader-repository" type="jboss:loader-repositoryType" minOccurs="0"/>
<xsd:element name="jmx-name" type="jboss:jmx-nameType" minOccurs="0"/>
- <xsd:element name="enforce-ejb-restrictions" type="javaee:string" minOccurs="0"/>
<xsd:element name="security-domain" type="jboss:security-domainType" minOccurs="0"/>
<xsd:element name="missing-method-permissions-excluded-mode" type="jboss:missing-method-permissions-excluded-modeType" minOccurs="0"/>
<xsd:element name="unauthenticated-principal" type="jboss:unauthenticated-principalType" minOccurs="0"/>
- <xsd:element name="exception-on-rollback" type="xsd:boolean" minOccurs="0"/>
<xsd:element name="jndi-binding-policy" type="jboss:jndi-binding-policyType" minOccurs="0"/>
<xsd:element name="jacc-context-id" type="jboss:jacc-context-idType" minOccurs="0"/>
<xsd:element name="webservices" type="jboss:webservicesType" minOccurs="0" maxOccurs="1"/>
@@ -357,20 +355,12 @@
<xsd:group ref="jboss:descriptionGroup"/>
<xsd:element name="ejb-name" type="javaee:ejb-nameType"/>
<xsd:element name="activation-config" type="jboss:activation-configType" minOccurs="0"/>
- <xsd:element name="destination-jndi-name" type="jboss:destination-jndi-nameType"
- minOccurs="0"/>
- <xsd:element name="local-jndi-name" type="jboss:local-jndi-nameType" minOccurs="0"/>
- <xsd:element name="jndi-binding-policy" type="jboss:jndi-binding-policyType" minOccurs="0"/>
+ <xsd:element name="destination-jndi-name" type="jboss:destination-jndi-nameType" minOccurs="0"/>
<xsd:element name="mdb-user" type="jboss:mdb-userType" minOccurs="0"/>
<xsd:element name="mdb-passwd" type="jboss:mdb-passwdType" minOccurs="0"/>
<xsd:element name="mdb-client-id" type="jboss:mdb-client-idType" minOccurs="0"/>
<xsd:element name="mdb-subscription-id" type="jboss:mdb-subscription-idType" minOccurs="0"/>
<xsd:element name="resource-adapter-name" type="jboss:resource-adapter-nameType" 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="ejb-ref" type="jboss:ejb-refType" minOccurs="0"
maxOccurs="unbounded"/>
@@ -390,7 +380,6 @@
<xsd:element name="security-domain" type="jboss:security-domainType" minOccurs="0"/>
<xsd:element name="method-attributes" type="jboss:method-attributesType" minOccurs="0"/>
<xsd:element name="depends" type="jboss:dependsType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="ior-security-config" type="jboss:ior-security-configType" minOccurs="0"/>
<xsd:element name="ejb-timeout-identity" type="jboss:security-identityType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="annotation" type="jboss:annotationType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="ignore-dependency" type="jboss:ignore-dependencyType" minOccurs="0"/>
@@ -714,22 +703,13 @@
<xsd:element name="producer" type="jboss:producerType" maxOccurs="unbounded"/>
<xsd:element name="local-producer" type="jboss:producerType" maxOccurs="unbounded"/>
<xsd:element name="current-message" type="jboss:method-attributesType"/>
- <xsd:element name="message-properties" type="jboss:message-propertiesType"
- maxOccurs="unbounded"/>
- <xsd:element name="jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
- <xsd:element name="local-jndi-name" type="jboss:local-jndi-nameType" minOccurs="0"/>
- <xsd:element name="jndi-binding-policy" type="jboss:jndi-binding-policyType" minOccurs="0"/>
- <xsd:element name="ejb-ref" type="jboss:ejb-refType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="ejb-local-ref" type="jboss:ejb-local-refType" minOccurs="0"
- maxOccurs="unbounded"/>
+ <xsd:element name="message-properties" type="jboss:message-propertiesType" maxOccurs="unbounded"/>
+ <xsd:element name="ejb-ref" type="jboss:ejb-refType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="ejb-local-ref" type="jboss:ejb-local-refType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="security-identity" type="jboss:security-identityType" minOccurs="0"/>
- <xsd:element name="resource-ref" type="jboss:resource-refType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="resource-env-ref" type="jboss:resource-env-refType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="message-destination-ref" type="jboss:message-destination-refType"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="resource-ref" type="jboss:resource-refType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="resource-env-ref" type="jboss:resource-env-refType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="message-destination-ref" type="jboss:message-destination-refType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="security-domain" type="jboss:security-domainType" minOccurs="0"/>
<xsd:element name="method-attributes" type="jboss:method-attributesType" minOccurs="0"/>
<xsd:element name="depends" type="jboss:dependsType" minOccurs="0" maxOccurs="unbounded"/>
@@ -789,12 +769,6 @@
<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"/>
@@ -805,13 +779,11 @@
<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>
@@ -909,12 +881,6 @@
<xsd:element name="business-remote" type="javaee:string" 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="jboss:local-jndi-nameType" minOccurs="0"/>
<xsd:element name="local-home-jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
<xsd:element name="jndi-binding-policy" type="jboss:jndi-binding-policyType" minOccurs="0"/>
@@ -932,7 +898,6 @@
<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>
@@ -975,61 +940,6 @@
<!-- **************************************************** -->
- <xsd:complexType name="invoker-bindingsType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Lists invoker proxy bindings for EJB2 container
- ]]>
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="invoker" type="jboss:invokerType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
- <!-- **************************************************** -->
-
- <xsd:complexType name="invokerType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Describes invoker proxy binding for EJB2 container
- ]]>
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="invoker-proxy-binding-name" type="javaee:string" minOccurs="1"/>
- <xsd:element name="jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
- <xsd:element name="ejb-ref" type="jboss:invoker-ejb-refType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
- <!-- **************************************************** -->
-
- <xsd:complexType name="invoker-ejb-refType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Describes ejb-ref for invoker proxy binding for EJB2 container
- ]]>
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="ejb-ref-name" type="javaee:string" minOccurs="1"/>
- <xsd:element name="jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <!-- **************************************************** -->
-
<xsd:complexType name="local-bindingType">
<xsd:annotation>
<xsd:documentation>
@@ -1334,64 +1244,6 @@
<!-- **************************************************** -->
- <!--
- ior-security-config element describes the security configuration information for the IOR.
- -->
- <xsd:complexType name="ior-security-configType">
- <xsd:sequence>
- <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="transport-config" type="jboss:transport-configType" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="as-context" type="jboss:as-contextType" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="sas-context" type="jboss:sas-contextType" minOccurs="0" maxOccurs="1"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID" />
- </xsd:complexType>
-
- <!--
-transport-config is the root element for security between the end points
--->
- <xsd:complexType name="transport-configType">
- <xsd:sequence>
- <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="integrity" type="xsd:string"/>
- <xsd:element name="confidentiality" type="xsd:string"/>
- <xsd:element name="establish-trust-in-target" type="xsd:string"/>
- <xsd:element name="establish-trust-in-client" type="xsd:string"/>
- <xsd:element name="detect-misordering" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="detect-replay" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID" />
- </xsd:complexType>
-
- <!--
-as-context (CSIv2 authentication service) is the element describing the authentication
-mechanism that will be used to authenticate the client. If specified it will be the
-username-password mechanism.
--->
- <xsd:complexType name="as-contextType">
- <xsd:sequence>
- <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="auth-method" type="xsd:string"/>
- <xsd:element name="realm" type="xsd:string"/>
- <xsd:element name="required" type="xsd:string"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID" />
- </xsd:complexType>
-
- <!--
-sas-context (related to CSIv2 security attribute service) element describes
-the sas-context fields.
--->
- <xsd:complexType name="sas-contextType">
- <xsd:sequence>
- <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="caller-propagation" type="xsd:string"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID" />
- </xsd:complexType>
-
- <!-- **************************************************** -->
-
<xsd:complexType name="cluster-configType">
<xsd:annotation>
<xsd:documentation> The cluster-config element allows to specify cluster specific settings.
@@ -1508,11 +1360,6 @@
<xsd:element name="security-identity" type="jboss:security-identityType" minOccurs="0"/>
<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="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="jboss:local-jndi-nameType" minOccurs="0"/>
<xsd:element name="local-home-jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
<xsd:element name="jndi-binding-policy" type="jboss:jndi-binding-policyType" minOccurs="0"/>
@@ -1525,7 +1372,6 @@
<xsd:element name="pool-config" type="jboss:pool-configType" 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="ior-security-config" type="jboss:ior-security-configType" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/JBoss51XSDBindingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/JBoss51XSDBindingUnitTestCase.java 2009-04-08 12:50:45 UTC (rev 86962)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/JBoss51XSDBindingUnitTestCase.java 2009-04-08 13:12:31 UTC (rev 86963)
@@ -24,7 +24,7 @@
import javax.xml.namespace.QName;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
+import org.jboss.metadata.ejb.jboss.JBoss51MetaData;
import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
/**
@@ -45,19 +45,21 @@
{
super.setUp();
// TODO review ignored types
- // the issue with container-configurations and invoker-proxy-bindings
- ignoreType(new QName(JavaEEMetaDataConstants.JBOSS_NS, "jbossType"));
// the issue with the subset of the jndi env reference group
ignoreType(new QName(JavaEEMetaDataConstants.JBOSS_NS, "message-driven-beanType"));
ignoreType(new QName(JavaEEMetaDataConstants.JBOSS_NS, "consumer-beanType"));
- // entity type is missing
// actually enterprise-beansType is missing because XmlElements binding specified on enterpriseBeans
// is bound as local type (specifying XmlType on JBossEnterpriseBeansMetaData breaks XmlElements' choice)
ignoreType(new QName(JavaEEMetaDataConstants.JBOSS_NS, "enterprise-beansType"));
}
+/* public void configureLogging()
+ {
+ enableTrace(getClass().getName());
+ }
+*/
public void testJBoss51() throws Exception
{
- assertEquivalent("jboss_5_1.xsd", JBoss50MetaData.class);
+ assertEquivalent("jboss_5_1.xsd", JBoss51MetaData.class);
}
}
More information about the jboss-cvs-commits
mailing list