[jboss-cvs] JBossAS SVN: r67466 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/annotation/creator/ejb and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 26 19:09:14 EST 2007
Author: scott.stark at jboss.org
Date: 2007-11-26 19:09:14 -0500 (Mon, 26 Nov 2007)
New Revision: 67466
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/TransactionAttributeTypeAdapter.java
Removed:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/TransAttributeType.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/TransactionMethodMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractTransactionAttributeProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IEnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ContainerTransactionMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
Log:
Change to use the spec TransactionAttributeType enum
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java 2007-11-26 23:26:25 UTC (rev 67465)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java 2007-11-27 00:09:14 UTC (rev 67466)
@@ -28,6 +28,8 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import javax.ejb.TransactionAttributeType;
+
import org.jboss.invocation.InvocationType;
import org.jboss.metadata.ejb.jboss.ContainerConfigurationMetaData;
import org.jboss.metadata.ejb.jboss.IORSecurityConfigMetaData;
@@ -40,7 +42,6 @@
import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
import org.jboss.metadata.ejb.spec.MethodInterfaceType;
import org.jboss.metadata.ejb.spec.MethodPermissionsMetaData;
-import org.jboss.metadata.ejb.spec.TransAttributeType;
import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
@@ -390,7 +391,7 @@
*/
public byte getMethodTransactionType(String methodName, Class[] params, InvocationType iface)
{
- TransAttributeType type = getDelegate().getMethodTransactionType(methodName, params, invocationTypeToMethodInterfaceType(iface));
+ TransactionAttributeType type = getDelegate().getMethodTransactionType(methodName, params, invocationTypeToMethodInterfaceType(iface));
return mapTransactionType(type);
}
@@ -410,7 +411,7 @@
if (b != null)
return b;
- TransAttributeType type = getDelegate().getMethodTransactionType(m, invocationTypeToMethodInterfaceType(iface));
+ TransactionAttributeType type = getDelegate().getMethodTransactionType(m, invocationTypeToMethodInterfaceType(iface));
byte result = mapTransactionType(type);
// provide default if method is not found in descriptor
@@ -758,21 +759,21 @@
* @param type the transaction type
* @return the byte
*/
- static byte mapTransactionType(TransAttributeType type)
+ static byte mapTransactionType(TransactionAttributeType type)
{
if (type == null)
return TX_UNKNOWN;
switch (type)
{
- case NotSupported:
+ case NOT_SUPPORTED:
return TX_NOT_SUPPORTED;
- case Supports:
+ case SUPPORTS:
return TX_SUPPORTS;
- case RequiresNew:
+ case REQUIRES_NEW:
return TX_REQUIRES_NEW;
- case Mandatory:
+ case MANDATORY:
return TX_MANDATORY;
- case Never:
+ case NEVER:
return TX_NEVER;
default:
return TX_REQUIRED;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/TransactionMethodMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/TransactionMethodMetaData.java 2007-11-26 23:26:25 UTC (rev 67465)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/TransactionMethodMetaData.java 2007-11-27 00:09:14 UTC (rev 67466)
@@ -21,8 +21,9 @@
*/
package org.jboss.metadata;
+import javax.ejb.TransactionAttributeType;
+
import org.jboss.metadata.ejb.spec.ContainerTransactionMetaData;
-import org.jboss.metadata.ejb.spec.TransAttributeType;
/**
* TransactionMethodMetaData.
@@ -52,7 +53,7 @@
*/
public byte getTransactionType()
{
- TransAttributeType attribute = getDelegate().getTransAttribute();
+ TransactionAttributeType attribute = getDelegate().getTransAttribute();
return BeanMetaData.mapTransactionType(attribute);
}
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractTransactionAttributeProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractTransactionAttributeProcessor.java 2007-11-26 23:26:25 UTC (rev 67465)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractTransactionAttributeProcessor.java 2007-11-27 00:09:14 UTC (rev 67466)
@@ -25,6 +25,7 @@
import java.lang.reflect.Method;
import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
import org.jboss.metadata.annotation.creator.AbstractFinderUser;
import org.jboss.metadata.annotation.creator.ProcessorUtils;
@@ -34,10 +35,7 @@
import org.jboss.metadata.ejb.spec.ContainerTransactionMetaData;
import org.jboss.metadata.ejb.spec.ContainerTransactionsMetaData;
import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.spec.MethodMetaData;
-import org.jboss.metadata.ejb.spec.MethodParametersMetaData;
import org.jboss.metadata.ejb.spec.MethodsMetaData;
-import org.jboss.metadata.ejb.spec.TransAttributeType;
/**
* E defines the actual annotated element we're working for.
@@ -61,24 +59,9 @@
return methods;
}
- protected TransAttributeType createTransAttributeType(TransactionAttribute annotation)
+ protected TransactionAttributeType createTransAttributeType(TransactionAttribute annotation)
{
- switch(annotation.value())
- {
- case MANDATORY:
- return TransAttributeType.Mandatory;
- case NEVER:
- return TransAttributeType.Never;
- case NOT_SUPPORTED:
- return TransAttributeType.NotSupported;
- case REQUIRED:
- return TransAttributeType.Required;
- case REQUIRES_NEW:
- return TransAttributeType.RequiresNew;
- case SUPPORTS:
- return TransAttributeType.Supports;
- }
- throw new IllegalArgumentException("Unknown transaction attribute value " + annotation.value());
+ return annotation.value();
}
public void process(T bean, E element)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IEnterpriseBeanMetaData.java 2007-11-26 23:26:25 UTC (rev 67465)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IEnterpriseBeanMetaData.java 2007-11-27 00:09:14 UTC (rev 67466)
@@ -23,16 +23,15 @@
import java.lang.reflect.Method;
+import javax.ejb.TransactionAttributeType;
import javax.ejb.TransactionManagementType;
import javax.xml.bind.annotation.XmlTransient;
import org.jboss.metadata.ejb.spec.ContainerTransactionsMetaData;
import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
-import org.jboss.metadata.ejb.spec.InterceptorBindingMetaData;
import org.jboss.metadata.ejb.spec.MethodInterfaceType;
import org.jboss.metadata.ejb.spec.MethodPermissionsMetaData;
import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
-import org.jboss.metadata.ejb.spec.TransAttributeType;
import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
@@ -108,13 +107,10 @@
public ServiceReferencesMetaData getServiceReferences();;
public MethodPermissionsMetaData getMethodPermissions();;
public ContainerTransactionsMetaData getContainerTransactions();;
- public TransAttributeType getMethodTransactionType(String methodName, Class<?>[] params, MethodInterfaceType iface);
- public TransAttributeType getMethodTransactionType(Method m, MethodInterfaceType iface);
+ public TransactionAttributeType getMethodTransactionType(String methodName, Class<?>[] params, MethodInterfaceType iface);
+ public TransactionAttributeType getMethodTransactionType(Method m, MethodInterfaceType iface);
public ExcludeListMetaData getExcludeList();
- //public IEnterpriseBeansMetaData getEnterpriseBeansMetaData();
@XmlTransient
public void setEnterpriseBeansMetaData(C data);
- //
- //public void merge(NamedMetaData merged, NamedMetaData original);
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-11-26 23:26:25 UTC (rev 67465)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-11-27 00:09:14 UTC (rev 67466)
@@ -27,6 +27,7 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import javax.ejb.TransactionAttributeType;
import javax.ejb.TransactionManagementType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
@@ -46,7 +47,6 @@
import org.jboss.metadata.ejb.spec.MethodPermissionsMetaData;
import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
-import org.jboss.metadata.ejb.spec.TransAttributeType;
import org.jboss.metadata.javaee.jboss.AnnotationsMetaData;
import org.jboss.metadata.javaee.jboss.IgnoreDependencyMetaData;
import org.jboss.metadata.javaee.jboss.JndiRefsMetaData;
@@ -171,7 +171,7 @@
private transient ContainerTransactionsMetaData cachedContainerTransactions;
/** The transaction type cache */
- private transient ConcurrentHashMap<Method, TransAttributeType> methodTx;
+ private transient ConcurrentHashMap<Method, TransactionAttributeType> methodTx;
/** The transaction type */
private TransactionManagementType transactionType;
@@ -330,10 +330,10 @@
* @param iface the interface type
* @return the method transaction type
*/
- public TransAttributeType getMethodTransactionType(String methodName, Class<?>[] params, MethodInterfaceType iface)
+ public TransactionAttributeType getMethodTransactionType(String methodName, Class<?>[] params, MethodInterfaceType iface)
{
// default value
- TransAttributeType result = null;
+ TransactionAttributeType result = null;
ContainerTransactionsMetaData containerTransactions = getContainerTransactions();
if (containerTransactions == null || containerTransactions.isEmpty())
@@ -364,12 +364,12 @@
* @param iface the interface type
* @return the transaction type
*/
- public TransAttributeType getMethodTransactionType(Method m, MethodInterfaceType iface)
+ public TransactionAttributeType getMethodTransactionType(Method m, MethodInterfaceType iface)
{
if (m == null)
- return TransAttributeType.Supports;
+ return TransactionAttributeType.SUPPORTS;
- TransAttributeType result = null;
+ TransactionAttributeType result = null;
if (methodTx != null)
{
result = methodTx.get(m);
@@ -381,10 +381,10 @@
// provide default if method is not found in descriptor
if (result == null)
- result = TransAttributeType.Required;
+ result = TransactionAttributeType.REQUIRED;
if (methodTx == null)
- methodTx = new ConcurrentHashMap<Method, TransAttributeType>();
+ methodTx = new ConcurrentHashMap<Method, TransactionAttributeType>();
methodTx.put(m, result);
return result;
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ContainerTransactionMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ContainerTransactionMetaData.java 2007-11-26 23:26:25 UTC (rev 67465)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/ContainerTransactionMetaData.java 2007-11-27 00:09:14 UTC (rev 67466)
@@ -21,9 +21,12 @@
*/
package org.jboss.metadata.ejb.spec;
+import org.jboss.metadata.javaee.spec.TransactionAttributeTypeAdapter;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptions;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.ejb.TransactionAttributeType;
/**
* ContainerTransactionMetaData.
@@ -41,7 +44,7 @@
private MethodsMetaData methods;
/** The transaction attribute */
- private TransAttributeType transAttribute;
+ private TransactionAttributeType transAttribute;
/**
* Create a new MethodPermissionMetaData.
@@ -81,7 +84,7 @@
* @return the transactionAttribute.
*/
@XmlElement(name="trans-attribute")
- public TransAttributeType getTransAttribute()
+ public TransactionAttributeType getTransAttribute()
{
return transAttribute;
}
@@ -92,7 +95,8 @@
* @param transactionAttribute the transactionAttribute.
* @throws IllegalArgumentException for a null transactionAttribute
*/
- public void setTransAttribute(TransAttributeType transactionAttribute)
+ @XmlJavaTypeAdapter(TransactionAttributeTypeAdapter.class)
+ public void setTransAttribute(TransactionAttributeType transactionAttribute)
{
if (transactionAttribute == null)
throw new IllegalArgumentException("Null transactionAttribute");
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java 2007-11-26 23:26:25 UTC (rev 67465)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java 2007-11-27 00:09:14 UTC (rev 67466)
@@ -24,6 +24,7 @@
import java.lang.reflect.Method;
import java.util.concurrent.ConcurrentHashMap;
+import javax.ejb.TransactionAttributeType;
import javax.ejb.TransactionManagementType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
@@ -95,7 +96,7 @@
private transient ContainerTransactionsMetaData cachedContainerTransactions;
/** The transaction type cache */
- private transient ConcurrentHashMap<Method, TransAttributeType> methodTx;
+ private transient ConcurrentHashMap<Method, TransactionAttributeType> methodTx;
/**
* Create the correct EnterpriseBeanMetaData for the input
@@ -512,10 +513,10 @@
* @param iface the interface type
* @return the method transaction type
*/
- public TransAttributeType getMethodTransactionType(String methodName, Class<?>[] params, MethodInterfaceType iface)
+ public TransactionAttributeType getMethodTransactionType(String methodName, Class<?>[] params, MethodInterfaceType iface)
{
// default value
- TransAttributeType result = null;
+ TransactionAttributeType result = null;
ContainerTransactionsMetaData containerTransactions = getContainerTransactions();
if (containerTransactions == null || containerTransactions.isEmpty())
@@ -546,12 +547,12 @@
* @param iface the interface type
* @return the transaction type
*/
- public TransAttributeType getMethodTransactionType(Method m, MethodInterfaceType iface)
+ public TransactionAttributeType getMethodTransactionType(Method m, MethodInterfaceType iface)
{
if (m == null)
- return TransAttributeType.Supports;
+ return TransactionAttributeType.SUPPORTS;
- TransAttributeType result = null;
+ TransactionAttributeType result = null;
if (methodTx != null)
{
result = methodTx.get(m);
@@ -563,10 +564,10 @@
// provide default if method is not found in descriptor
if (result == null)
- result = TransAttributeType.Required;
+ result = TransactionAttributeType.REQUIRED;
if (methodTx == null)
- methodTx = new ConcurrentHashMap<Method, TransAttributeType>();
+ methodTx = new ConcurrentHashMap<Method, TransactionAttributeType>();
methodTx.put(m, result);
return result;
}
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/TransAttributeType.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/TransAttributeType.java 2007-11-26 23:26:25 UTC (rev 67465)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/TransAttributeType.java 2007-11-27 00:09:14 UTC (rev 67466)
@@ -1,52 +0,0 @@
-/*
-* 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.spec;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * TransAttributeType.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
- at XmlType(name="trans-attributeType")
-public enum TransAttributeType
-{
- /** Not Supprot */
- NotSupported,
-
- /** Supports */
- Supports,
-
- /** Required */
- Required,
-
- /** RequiresNew */
- RequiresNew,
-
- /** Mandatory */
- Mandatory,
-
- /** Never */
- Never,
-}
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/TransactionAttributeTypeAdapter.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/TransactionAttributeTypeAdapter.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/TransactionAttributeTypeAdapter.java 2007-11-27 00:09:14 UTC (rev 67466)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * 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.javaee.spec;
+
+import javax.ejb.TransactionAttributeType;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+/**
+ * TransactionAttributeType enum type adapter
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class TransactionAttributeTypeAdapter
+ extends XmlAdapter<String, TransactionAttributeType>
+{
+
+ @Override
+ public String marshal(TransactionAttributeType type) throws Exception
+ {
+ String stype = null;
+ switch (type)
+ {
+ case NOT_SUPPORTED:
+ stype = "NotSupported";
+ case SUPPORTS:
+ stype = "Supports";
+ case REQUIRES_NEW:
+ stype = "RequiresNew";
+ case MANDATORY:
+ stype = "Mandatory";
+ case NEVER:
+ stype = "Never";
+ default:
+ stype = "Required";
+ }
+ return stype;
+ }
+
+ @Override
+ public TransactionAttributeType unmarshal(String string) throws Exception
+ {
+ TransactionAttributeType type = TransactionAttributeType.REQUIRED;
+ if(string.equals("NotSupported"))
+ type = TransactionAttributeType.NOT_SUPPORTED;
+ else if(string.equals("Supports"))
+ type = TransactionAttributeType.SUPPORTS;
+ else if(string.equals("RequiresNew"))
+ type = TransactionAttributeType.REQUIRES_NEW;
+ else if(string.equals("Mandatory"))
+ type = TransactionAttributeType.MANDATORY;
+ else if(string.equals("Never"))
+ type = TransactionAttributeType.NEVER;
+ return type;
+ }
+
+}
Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/TransactionAttributeTypeAdapter.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2007-11-26 23:26:25 UTC (rev 67465)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2007-11-27 00:09:14 UTC (rev 67466)
@@ -33,6 +33,8 @@
import java.util.Iterator;
import java.util.List;
+import javax.ejb.TransactionAttributeType;
+
import org.jboss.metadata.annotation.creator.ejb.EjbJar30Creator;
import org.jboss.metadata.annotation.finder.AnnotationFinder;
import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
@@ -70,7 +72,6 @@
import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
import org.jboss.metadata.ejb.spec.SessionType;
-import org.jboss.metadata.ejb.spec.TransAttributeType;
import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
@@ -226,10 +227,10 @@
assertNotNull("bean has no container transactions", bean.getContainerTransactions());
Iterator<ContainerTransactionMetaData> it = bean.getContainerTransactions().iterator();
ContainerTransactionMetaData tx1 = it.next();
- assertEquals(TransAttributeType.Never, tx1.getTransAttribute());
+ assertEquals(TransactionAttributeType.NEVER, tx1.getTransAttribute());
// TODO: methods
ContainerTransactionMetaData tx2 = it.next();
- assertEquals(TransAttributeType.Mandatory, tx2.getTransAttribute());
+ assertEquals(TransactionAttributeType.MANDATORY, tx2.getTransAttribute());
MethodsMetaData tx2Methods = tx2.getMethods();
String[] params = {};
tx2Methods.matches("transactionAttributeMandatory", params, null);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2007-11-26 23:26:25 UTC (rev 67465)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2007-11-27 00:09:14 UTC (rev 67466)
@@ -27,6 +27,7 @@
import java.util.Set;
import java.util.Map.Entry;
+import javax.ejb.TransactionAttributeType;
import javax.ejb.TransactionManagementType;
import junit.framework.AssertionFailedError;
@@ -77,7 +78,6 @@
import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
import org.jboss.metadata.ejb.spec.SessionType;
-import org.jboss.metadata.ejb.spec.TransAttributeType;
import org.jboss.metadata.javaee.jboss.IgnoreDependencyMetaData;
import org.jboss.metadata.javaee.spec.PortComponent;
import org.jboss.metadata.javaee.spec.RunAsMetaData;
@@ -970,17 +970,17 @@
else
assertMethods(ejbName, prefix + count + "Method", 1, containerTransactionMetaData.getMethods());
if (count == 1)
- assertEquals(TransAttributeType.NotSupported, containerTransactionMetaData.getTransAttribute());
+ assertEquals(TransactionAttributeType.NOT_SUPPORTED, containerTransactionMetaData.getTransAttribute());
else if (count == 2)
- assertEquals(TransAttributeType.Supports, containerTransactionMetaData.getTransAttribute());
+ assertEquals(TransactionAttributeType.SUPPORTS, containerTransactionMetaData.getTransAttribute());
else if (count == 3)
- assertEquals(TransAttributeType.Required, containerTransactionMetaData.getTransAttribute());
+ assertEquals(TransactionAttributeType.REQUIRED, containerTransactionMetaData.getTransAttribute());
else if (count == 4)
- assertEquals(TransAttributeType.RequiresNew, containerTransactionMetaData.getTransAttribute());
+ assertEquals(TransactionAttributeType.REQUIRES_NEW, containerTransactionMetaData.getTransAttribute());
else if (count == 5)
- assertEquals(TransAttributeType.Mandatory, containerTransactionMetaData.getTransAttribute());
+ assertEquals(TransactionAttributeType.MANDATORY, containerTransactionMetaData.getTransAttribute());
else
- assertEquals(TransAttributeType.Never, containerTransactionMetaData.getTransAttribute());
+ assertEquals(TransactionAttributeType.NEVER, containerTransactionMetaData.getTransAttribute());
++count;
if (count > limit)
break;
More information about the jboss-cvs-commits
mailing list