[jboss-cvs] JBossAS SVN: r72134 - in trunk/server/src: main/org/jboss/deployment and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Apr 13 11:11:46 EDT 2008
Author: ALRubinger
Date: 2008-04-13 11:11:45 -0400 (Sun, 13 Apr 2008)
New Revision: 72134
Modified:
trunk/server/src/etc/deployers/metadata-beans.xml
trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
Log:
[JBAS-5423] metadata-complete, by Spec, must be false as default
Modified: trunk/server/src/etc/deployers/metadata-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/metadata-beans.xml 2008-04-13 14:52:05 UTC (rev 72133)
+++ trunk/server/src/etc/deployers/metadata-beans.xml 2008-04-13 15:11:45 UTC (rev 72134)
@@ -13,7 +13,7 @@
</bean>
<bean name="AnnotationMetaDataDeployer"
class="org.jboss.deployment.AnnotationMetaDataDeployer">
- <property name="metaDataCompleteIsDefault">true</property>
+ <property name="metaDataCompleteIsDefault">false</property>
</bean>
<!-- The schema location to JBossXB binding class mappings. We specify the dtd/xsd name
Modified: trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java 2008-04-13 14:52:05 UTC (rev 72133)
+++ trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java 2008-04-13 15:11:45 UTC (rev 72134)
@@ -61,7 +61,7 @@
public static final String CLIENT_ANNOTATED_ATTACHMENT_NAME = "annotated."+ApplicationClientMetaData.class.getName();
public static final String WEB_ANNOTATED_ATTACHMENT_NAME = "annotated."+WebMetaData.class.getName();
- private boolean metaDataCompleteIsDefault = true;
+ private boolean metaDataCompleteIsDefault = false;
public AnnotationMetaDataDeployer()
{
@@ -109,7 +109,7 @@
throws DeploymentException
{
// Ignore any metadata complete deployments
- boolean isComplete = metaDataCompleteIsDefault;
+ boolean isComplete = this.isMetaDataCompleteIsDefault();
/* Since we haven't merged yet, JBossMetaData is not the authority on isMetadataComplete
JBossMetaData jbossMetaData = unit.getAttachment(JBossMetaData.class);
if(jbossMetaData != null)
@@ -117,13 +117,13 @@
*/
EjbJarMetaData ejbJarMetaData = unit.getAttachment(EjbJarMetaData.class);
if(ejbJarMetaData != null && ejbJarMetaData instanceof EjbJar3xMetaData)
- isComplete &= ((EjbJar3xMetaData) ejbJarMetaData).isMetadataComplete();
+ isComplete |= ((EjbJar3xMetaData) ejbJarMetaData).isMetadataComplete();
JBossWebMetaData jbossWebMetaData = unit.getAttachment(JBossWebMetaData.class);
if(jbossWebMetaData != null)
- isComplete &= jbossWebMetaData.isMetadataComplete();
+ isComplete |= jbossWebMetaData.isMetadataComplete();
JBossClientMetaData jbossClientMetaData = unit.getAttachment(JBossClientMetaData.class);
if(jbossClientMetaData != null)
- isComplete &= jbossClientMetaData.isMetadataComplete();
+ isComplete |= jbossClientMetaData.isMetadataComplete();
if(isComplete)
{
log.debug("Deployment is metadata-complete, skipping annotation processing"
More information about the jboss-cvs-commits
mailing list