[jboss-cvs] JBossAS SVN: r90767 - in projects/ejb3/trunk/core: src/main/java/org/jboss/ejb3 and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 2 08:18:11 EDT 2009
Author: jaikiran
Date: 2009-07-02 08:18:10 -0400 (Thu, 02 Jul 2009)
New Revision: 90767
Modified:
projects/ejb3/trunk/core/pom.xml
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/dependency/EjbLinkDemandMetaData.java
projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml
projects/ejb3/trunk/core/src/main/resources/ejb3-connectors-jboss-beans.xml
projects/ejb3/trunk/core/src/main/resources/ejb3-container-jboss-beans.xml
Log:
EJBTHREE-1854 Configure EJB3 MC beans (EJBContainer and other MC beans) to disable AOPDependencyBuilder
Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml 2009-07-02 12:10:30 UTC (rev 90766)
+++ projects/ejb3/trunk/core/pom.xml 2009-07-02 12:18:10 UTC (rev 90767)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java 2009-07-02 12:10:30 UTC (rev 90766)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java 2009-07-02 12:18:10 UTC (rev 90767)
@@ -66,6 +66,7 @@
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.annotation.AnnotationRepository;
import org.jboss.aop.joinpoint.ConstructionInvocation;
+import org.jboss.aop.microcontainer.annotations.DisableAOP;
import org.jboss.aop.util.MethodHashing;
import org.jboss.aspects.currentinvocation.CurrentInvocationInterceptor;
import org.jboss.beans.metadata.api.annotations.Inject;
@@ -126,6 +127,7 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
+ at DisableAOP
public abstract class EJBContainer
implements Container, IndirectContainer<EJBContainer, DirectContainer<EJBContainer>>,
EJBInjectionContainer, ExtendedInjectionContainer, JavaEEComponent
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/dependency/EjbLinkDemandMetaData.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/dependency/EjbLinkDemandMetaData.java 2009-07-02 12:10:30 UTC (rev 90766)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/dependency/EjbLinkDemandMetaData.java 2009-07-02 12:18:10 UTC (rev 90767)
@@ -51,15 +51,15 @@
implements DemandMetaData, Serializable
{
private static final long serialVersionUID = 1L;
-
+
/** The demand */
private ObjectName demand;
-
+
/** When the dependency is required */
private ControllerState whenRequired = ControllerState.DESCRIBED;
/**
- *
+ *
* @param component the component which needs the enterprise bean
* @param ejbName the name of the enterprise bean to find
*/
@@ -102,7 +102,7 @@
visitor.addDependency(item);
visitor.initialVisit(this);
}
-
+
@Override
public void toString(JBossStringBuilder buffer)
{
@@ -110,7 +110,7 @@
if (whenRequired != null)
buffer.append(" whenRequired=").append(whenRequired.getStateString());
}
-
+
@Override
public void toShortString(JBossStringBuilder buffer)
{
@@ -123,7 +123,7 @@
{
super(name, null, whenRequired, null);
}
-
+
@Override
public boolean resolve(Controller controller)
{
@@ -132,7 +132,7 @@
try
{
ObjectName otherName = new ObjectName(context.getName().toString());
-
+
if(demand.apply(otherName))
{
setIDependOn(context.getName());
@@ -149,14 +149,14 @@
setResolved(false);
return isResolved();
}
-
+
@Override
public void toString(JBossStringBuilder buffer)
{
super.toString(buffer);
buffer.append(" demand=").append(demand.getCanonicalName());
}
-
+
@Override
public void toShortString(JBossStringBuilder buffer)
{
@@ -171,4 +171,14 @@
return builder.toString();
}
}
+
+ /**
+ * @see DemandMetaData#getTargetState()
+ *
+ * @return Return the default {@link ControllerState#INSTALLED}
+ */
+ public ControllerState getTargetState()
+ {
+ return ControllerState.INSTALLED;
+ }
}
Modified: projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml 2009-07-02 12:10:30 UTC (rev 90766)
+++ projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml 2009-07-02 12:18:10 UTC (rev 90767)
@@ -5,6 +5,9 @@
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<!-- We don't want the AOPDependencyBuilder -->
+ <annotation>@org.jboss.aop.microcontainer.annotations.DisableAOP</annotation>
+
<bean name="MessageDestinationReferenceResolver" class="org.jboss.ejb3.resolvers.DefaultMessageDestinationReferenceResolver"/>
<bean name="Ejb3DependenciesDeployer" class="org.jboss.ejb3.deployers.Ejb3DependenciesDeployer">
Modified: projects/ejb3/trunk/core/src/main/resources/ejb3-connectors-jboss-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/ejb3-connectors-jboss-beans.xml 2009-07-02 12:10:30 UTC (rev 90766)
+++ projects/ejb3/trunk/core/src/main/resources/ejb3-connectors-jboss-beans.xml 2009-07-02 12:18:10 UTC (rev 90767)
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
+
EJB3 Connectors
-
+
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <!-- We don't want the AOPDependencyBuilder -->
+ <annotation>@org.jboss.aop.microcontainer.annotations.DisableAOP</annotation>
- <!--
-
- JBoss Remoting Connector
-
+ <!--
+
+ JBoss Remoting Connector
+
Note: Bean Name "org.jboss.ejb3.RemotingConnector" is used
as a lookup value; alter only after checking java references
to this key.
-
+
-->
<bean name="org.jboss.ejb3.RemotingConnector"
class="org.jboss.remoting.transport.Connector">
Modified: projects/ejb3/trunk/core/src/main/resources/ejb3-container-jboss-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/ejb3-container-jboss-beans.xml 2009-07-02 12:10:30 UTC (rev 90766)
+++ projects/ejb3/trunk/core/src/main/resources/ejb3-container-jboss-beans.xml 2009-07-02 12:18:10 UTC (rev 90767)
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- We don't want the AOPDependencyBuilder -->
+ <annotation>@org.jboss.aop.microcontainer.annotations.DisableAOP</annotation>
+
+
<!-- The provider for EJB3 UserTransactions -->
<bean name="EJB3UserTransactionprovider" class="org.jboss.ejb3.tx.EJB3UserTransactionProvider">
<depends>UserTransactionRegistry</depends>
More information about the jboss-cvs-commits
mailing list