modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml | 53 ++++++---- 1 file changed, 33 insertions(+), 20 deletions(-)
New commits: commit e0e91c0fc690deca344eb23b8b0ba4cea4fed66e Author: John Mazzitelli mazz@redhat.com Date: Tue Aug 21 11:21:58 2012 -0400
looks like AS7 now requires this <interceptors> section in ejb-jar.xml which we didn't have before
diff --git a/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml b/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml index d6e666e..b3deb45 100644 --- a/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml +++ b/modules/enterprise/server/jar/src/main/resources/META-INF/ejb-jar.xml @@ -1,28 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" - version="3.1"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" + version="3.1"> + + <description>RHQ</description> + <display-name>RHQ</display-name>
- <description>RHQ</description> - <display-name>RHQ</display-name> + <interceptors> + <interceptor> + <interceptor-class>org.rhq.enterprise.server.authz.RequiredPermissionsInterceptor</interceptor-class> + </interceptor> + <interceptor> + <interceptor-class>org.rhq.enterprise.server.common.TransactionInterruptInterceptor</interceptor-class> + </interceptor> + <interceptor> + <interceptor-class>org.rhq.enterprise.server.common.PerformanceMonitorInterceptor</interceptor-class> + </interceptor> + </interceptors>
- <assembly-descriptor> + <assembly-descriptor>
- <!-- all our EJB3 SLSBs can define custom @RequiredPermissions annotations for authorization checks--> - <interceptor-binding> - <ejb-name>*</ejb-name> - <interceptor-class>org.rhq.enterprise.server.authz.RequiredPermissionsInterceptor</interceptor-class> - </interceptor-binding> - <interceptor-binding> - <ejb-name>*</ejb-name> - <interceptor-class>org.rhq.enterprise.server.common.TransactionInterruptInterceptor</interceptor-class> - </interceptor-binding> - <interceptor-binding> - <ejb-name>*</ejb-name> - <interceptor-class>org.rhq.enterprise.server.common.PerformanceMonitorInterceptor</interceptor-class> - </interceptor-binding> + <!-- all our EJB3 SLSBs can define custom @RequiredPermissions annotations for authorization checks--> + <interceptor-binding> + <ejb-name>*</ejb-name> + <interceptor-class>org.rhq.enterprise.server.authz.RequiredPermissionsInterceptor</interceptor-class> + </interceptor-binding> + <interceptor-binding> + <ejb-name>*</ejb-name> + <interceptor-class>org.rhq.enterprise.server.common.TransactionInterruptInterceptor</interceptor-class> + </interceptor-binding> + <interceptor-binding> + <ejb-name>*</ejb-name> + <interceptor-class>org.rhq.enterprise.server.common.PerformanceMonitorInterceptor</interceptor-class> + </interceptor-binding>
- </assembly-descriptor> + </assembly-descriptor>
</ejb-jar>
rhq-commits@lists.fedorahosted.org