[jboss-cvs] JBossAS SVN: r72797 - in projects/microcontainer/trunk/aop-mc-int/src: resources/main/schema and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 28 17:12:06 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-04-28 17:12:05 -0400 (Mon, 28 Apr 2008)
New Revision: 72797
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/MixinData.java
projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.xml
Log:
[JBAOP-468] transient is an attribute of and not a child of <mixin>
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java 2008-04-28 20:09:12 UTC (rev 72796)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java 2008-04-28 21:12:05 UTC (rev 72797)
@@ -168,10 +168,7 @@
BeanMetaDataBuilder mixinBuilder = BeanMetaDataBuilder.createBuilder(name, MixinEntry.class.getName());
mixinBuilder.addPropertyMetaData("mixin", mixin.getMixin());
addInterfaces(mixinBuilder, "interfaces", mixin.getInterfaces());
- if (mixin.getTransient() != null)
- {
- mixinBuilder.addPropertyMetaData("transient", mixin.getTransient());
- }
+ mixinBuilder.addPropertyMetaData("transient", mixin.getTransient());
if (mixin.getConstruction() != null)
{
mixinBuilder.addPropertyMetaData("construction", mixin.getConstruction());
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/MixinData.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/MixinData.java 2008-04-28 20:09:12 UTC (rev 72796)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/MixinData.java 2008-04-28 21:12:05 UTC (rev 72797)
@@ -21,6 +21,7 @@
*/
package org.jboss.aop.microcontainer.beans.metadata;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
/**
@@ -31,16 +32,17 @@
public class MixinData
{
String mixin;
- String isTransient;
+ boolean isTransient = true;
String construction;
String interfaces;
- public String getTransient()
+ public boolean getTransient()
{
return isTransient;
}
- public void setTransient(String isTransient)
+ @XmlAttribute
+ public void setTransient(boolean isTransient)
{
this.isTransient = isTransient;
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd 2008-04-28 20:09:12 UTC (rev 72796)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd 2008-04-28 21:12:05 UTC (rev 72797)
@@ -857,61 +857,9 @@
<xsd:element name="class" type="xsd:string" minOccurs="1" maxOccurs="1" />
<xsd:element name="construction" type="xsd:string" minOccurs="0" maxOccurs="1" />
</xsd:all>
- <xsd:attribute name="transient" type="xsd:string" use="optional"/>
+ <xsd:attribute name="transient" type="xsd:boolean" use="optional"/>
</xsd:complexType>
- <xsd:complexType name="interfacesType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- A interfaces within an introduction or an introduction/mixin
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:simpleContent>
- <xsd:extension base="xsd:string"/>
- </xsd:simpleContent>
- </xsd:complexType>
-
- <xsd:complexType name="classType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- A class within an interface/mixin
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:simpleContent>
- <xsd:extension base="xsd:string"/>
- </xsd:simpleContent>
- </xsd:complexType>
-
- <xsd:complexType name="constructionType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- How to construct an interface/mixin
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:simpleContent>
- <xsd:extension base="xsd:string"/>
- </xsd:simpleContent>
- </xsd:complexType>
-
- <xsd:complexType name="transientType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Whether an interface/mixin should be transient
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:simpleContent>
- <xsd:extension base="xsd:string"/>
- </xsd:simpleContent>
- </xsd:complexType>
-
<xsd:element name="metadata" type="metadataType">
<xsd:annotation>
<xsd:documentation>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleAopTestCase.xml 2008-04-28 20:09:12 UTC (rev 72796)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleAopTestCase.xml 2008-04-28 21:12:05 UTC (rev 72797)
@@ -22,26 +22,25 @@
</precedence>
<introduction name="MixinBinding" class="org.jboss.test.microcontainer.beans.POJO">
- <mixin>
+ <mixin transient="true">
<interfaces>org.jboss.test.microcontainer.beans.MixinInterface</interfaces>
<class>org.jboss.test.microcontainer.beans.MixinImpl</class>
- <transient>true</transient>
</mixin>
</introduction>
<pointcut name="NamedPointcut" expr="all(org.acme.POJO)"/>
<prepare name="Prepare" expr="all(org.acme.POJO)"/>
-
+
<dynamic-cflow name="DynamicCFlow" class="org.jboss.test.microcontainer.beans.DynamicCFlowImpl"/>
-
+
<cflow-stack name="CFlow">
<not-called expr="void org.jboss.test.microcontainer.beans.test.CFlowTest->notCallPOJO(..)"/>
<called expr="void org.jboss.test.microcontainer.beans.test.CFlowTest->callPOJO(..)"/>
</cflow-stack>
<typedef name="TypeDef" expr="class(org.jboss.test.microcontainer.beans.POJO)"/>
-
+
<aspect class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
<property name="someProperty">This is only a test</property>
</aspect>
@@ -53,7 +52,7 @@
<stack name="TestStack">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</stack>
-
+
<bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithProperty" name="advice"/>
<interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
@@ -61,7 +60,7 @@
</bind>
<arrayreplacement class="org.jboss.test.microcontainer.beans.woven.test.ClassWithArray"/>
-
+
<arraybind name="TestArrayBinding" type="READ_WRITE">
<interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
</arraybind>
@@ -73,6 +72,6 @@
</metadata>
<declare-error name="DeclareError" expr="call(* org.acme.Foo->error(..))">Error!!!</declare-error>
- </domain>
-
+ </domain>
+
</aop>
\ No newline at end of file
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleDeploymentTestCase.xml 2008-04-28 20:09:12 UTC (rev 72796)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleDeploymentTestCase.xml 2008-04-28 21:12:05 UTC (rev 72797)
@@ -22,26 +22,25 @@
</precedence>
<introduction xmlns="urn:jboss:aop-beans:1.0" name="MixinBinding" class="org.jboss.test.microcontainer.beans.POJO">
- <mixin>
+ <mixin transient="true">
<interfaces>org.jboss.test.microcontainer.beans.MixinInterface</interfaces>
<class>org.jboss.test.microcontainer.beans.MixinImpl</class>
- <transient>true</transient>
</mixin>
</introduction>
<pointcut xmlns="urn:jboss:aop-beans:1.0" name="NamedPointcut" expr="all(org.acme.POJO)"/>
<prepare xmlns="urn:jboss:aop-beans:1.0" name="Prepare" expr="all(org.acme.POJO)"/>
-
+
<dynamic-cflow xmlns="urn:jboss:aop-beans:1.0" name="DynamicCFlow" class="org.jboss.test.microcontainer.beans.DynamicCFlowImpl"/>
-
+
<cflow-stack xmlns="urn:jboss:aop-beans:1.0" name="CFlow">
<not-called expr="void org.jboss.test.microcontainer.beans.test.CFlowTest->notCallPOJO(..)"/>
<called expr="void org.jboss.test.microcontainer.beans.test.CFlowTest->callPOJO(..)"/>
</cflow-stack>
<typedef name="TypeDef" expr="class(org.jboss.test.microcontainer.beans.POJO)"/>
-
+
<aspect class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
<property xmlns:mc="urn:jboss:bean-deployer:2.0" name="someProperty">This is only a test</property>
</aspect>
@@ -53,7 +52,7 @@
<stack name="TestStack">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</stack>
-
+
<bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithProperty" name="advice"/>
<interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
@@ -61,11 +60,11 @@
</bind>
<arrayreplacement class="org.jboss.test.microcontainer.beans.woven.test.ClassWithArray"/>
-
+
<arraybind name="TestArrayBinding" type="READ_WRITE">
<interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
</arraybind>
-
+
<metadata-loader xmlns="urn:jboss:aop-beans:1.0" tag="custom" class="org.jboss.test.microcontainer.beans.TestMetaDataLoader"/>
<metadata xmlns="urn:jboss:aop-beans:1.0" tag="custom" class="org.jboss.test.microcontainer.beans.POJO">
@@ -73,6 +72,6 @@
</metadata>
<declare-error name="DeclareError" expr="call(* org.acme.Foo->error(..))">Error!!!</declare-error>
- </domain>
-
+ </domain>
+
</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesAopTestCase.xml 2008-04-28 20:09:12 UTC (rev 72796)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesAopTestCase.xml 2008-04-28 21:12:05 UTC (rev 72797)
@@ -7,10 +7,9 @@
</bean>
<introduction class="org.jboss.test.microcontainer.beans.POJO">
- <mixin>
+ <mixin transient="true">
<interfaces>org.jboss.test.microcontainer.beans.MixinInterface</interfaces>
<class>org.jboss.test.microcontainer.beans.MixinImpl</class>
- <transient>true</transient>
</mixin>
</introduction>
@@ -19,7 +18,7 @@
<bind pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.MixinInterface}->*(..))">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</bind>
-
+
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+
</aop>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.xml 2008-04-28 20:09:12 UTC (rev 72796)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.xml 2008-04-28 21:12:05 UTC (rev 72797)
@@ -7,10 +7,9 @@
</bean>
<introduction xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.POJO">
- <mixin>
+ <mixin transient="true">
<interfaces>org.jboss.test.microcontainer.beans.MixinInterface</interfaces>
<class>org.jboss.test.microcontainer.beans.MixinImpl</class>
- <transient>true</transient>
</mixin>
</introduction>
@@ -19,7 +18,7 @@
<bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.MixinInterface}->*(..))">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</bind>
-
+
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+
</deployment>
More information about the jboss-cvs-commits
mailing list