[jboss-cvs] JBossAS SVN: r82829 - in projects/aop/trunk/aspects: src and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 13 16:04:13 EST 2009
Author: pgier
Date: 2009-01-13 16:04:12 -0500 (Tue, 13 Jan 2009)
New Revision: 82829
Added:
projects/aop/trunk/aspects/src/main/java/
projects/aop/trunk/aspects/src/main/java/org/
projects/aop/trunk/aspects/src/test/java/
projects/aop/trunk/aspects/src/test/java/org/
projects/aop/trunk/aspects/src/test/java/test/
projects/aop/trunk/aspects/src/test/resources/
projects/aop/trunk/aspects/src/test/resources/aop-deployer_1_1.xsd
projects/aop/trunk/aspects/src/test/resources/org/
projects/aop/trunk/aspects/src/test/resources/test/
Removed:
projects/aop/trunk/aspects/src/etc/
projects/aop/trunk/aspects/src/main/org/
projects/aop/trunk/aspects/src/resources/aop-deployer_1_1.xsd
projects/aop/trunk/aspects/src/resources/org/
projects/aop/trunk/aspects/src/resources/test/
projects/aop/trunk/aspects/src/test/org/
projects/aop/trunk/aspects/src/test/test/
Modified:
projects/aop/trunk/aspects/pom.xml
Log:
[JBBUILD-511] Move directories to match standard maven project structure.
Modified: projects/aop/trunk/aspects/pom.xml
===================================================================
--- projects/aop/trunk/aspects/pom.xml 2009-01-13 20:52:02 UTC (rev 82828)
+++ projects/aop/trunk/aspects/pom.xml 2009-01-13 21:04:12 UTC (rev 82829)
@@ -11,27 +11,6 @@
<build>
<finalName>${artifactId}</finalName>
- <sourceDirectory>src/main</sourceDirectory>
- <!--<testSourceDirectory>src/test</testSourceDirectory>-->
- <resources>
- <resource>
- <directory>docs</directory>
- <includes>
- <include>jboss-aop_1_0.dtd</include>
- </includes>
- </resource>
- <resource>
- <directory>src/etc</directory>
- <includes>
- <include>jbossorg-eula.txt</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/resources</directory>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -43,6 +22,7 @@
<testExcludes>
<testExclude>org/jboss/test/asynch/**</testExclude>
<testExclude>org/jboss/test/proxyfactory/**</testExclude>
+ <testExclude>org/jboss/test/aspects/mock/MockTestCase.java</testExclude>
</testExcludes>
</configuration>
</plugin>
Copied: projects/aop/trunk/aspects/src/main/java/org (from rev 82827, projects/aop/trunk/aspects/src/main/org)
Property changes on: projects/aop/trunk/aspects/src/main/java/org
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: projects/aop/trunk/aspects/src/resources/aop-deployer_1_1.xsd
===================================================================
--- projects/aop/trunk/aspects/src/resources/aop-deployer_1_1.xsd 2009-01-13 20:52:02 UTC (rev 82828)
+++ projects/aop/trunk/aspects/src/resources/aop-deployer_1_1.xsd 2009-01-13 21:04:12 UTC (rev 82829)
@@ -1,415 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- A prototype xsd schema for the pojoserver xml deployer
-$Id$
- -->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:jboss:aop-deployer"
- xmlns="urn:jboss:aop-deployer"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="1.0">
- <xsd:annotation>
- <xsd:documentation><![CDATA[
- The xml deployer schema. The deployment document instance
- root element should reference the schema in the root
- deployment element using something like:
-
- <aop
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:aop-deployer aop-deployer_1_1.xsd"
- xmlns="urn:jboss:aop-deployer">
- ]]>
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:complexType name="typedefType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="expr" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="annotationType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:attribute name="expr" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="annotationIntroductionType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:attribute name="expr" type="xsd:string" use="required"/>
- <xsd:attribute name="invisible" type="booleanType" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="dynamicCflowType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="class" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="cflowCalledType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:attribute name="expr" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="cflowNotCalledType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:attribute name="expr" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="cflowStackType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element name="called" type="cflowCalledType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="not-called" type="cflowNotCalledType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="bindType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element name="interceptor-ref" type="interceptorRefType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="stack-ref" type="stackRefType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="advice" type="adviceType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="optional"/>
- <xsd:attribute name="pointcut" type="xsd:string" use="required"/>
- <xsd:attribute name="cflow" type="xsd:string" use="optional"/>
- </xsd:complexType>
-
- <xsd:complexType name="pluggable-pointcut">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:any minOccurs="0" maxOccurs="1" namespace="##other"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="class" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="prepareType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="expr" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="pointcutType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="expr" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="interceptorRefType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="stackRefType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="adviceType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="aspect" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="stackType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element name="interceptor-ref" type="interceptorRefType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="stack-ref" type="stackRefType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="advice" type="adviceType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="metadata">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:any minOccurs="0" maxOccurs="1" namespace="##other"/>
- </xsd:sequence>
- <xsd:attribute name="tag" type="xsd:string" use="required"/>
- <xsd:attribute name="class" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="metadataLoaderType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:attribute name="tag" type="xsd:string" use="required"/>
- <xsd:attribute name="class" type="xsd:string" use="required"/>
- </xsd:complexType>
-
- <xsd:complexType name="mixinType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element name="interfaces" type="xsd:string" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="class" type="xsd:string" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="construction" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- </xsd:sequence>
- <xsd:attribute name="transient" type="xsd:string" use="optional"/>
- </xsd:complexType>
-
- <xsd:complexType name="introductionType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element name="mixin" type="mixinType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="interfaces" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- </xsd:sequence>
- <xsd:attribute name="class" type="xsd:string" use="optional"/>
- <xsd:attribute name="expr" type="xsd:string" use="optional"/>
- </xsd:complexType>
-
- <xsd:simpleType name="aspectScope">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="PER_VM" />
- <xsd:enumeration value="PER_CLASS" />
- <xsd:enumeration value="PER_INSTANCE" />
- <xsd:enumeration value="PER_JOINPOINT" />
- <xsd:enumeration value="PER_CLASS_JOINPOINT" />
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="booleanType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="true" />
- <xsd:enumeration value="false" />
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="aspectType">
- <xsd:choice minOccurs="0" maxOccurs="1">
- <xsd:element name="class" type="xsd:anyType"/>
- <xsd:element name="factory" type="xsd:anyType"/>
- </xsd:choice>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="class" type="xsd:string" use="optional"/>
- <xsd:attribute name="factory" type="xsd:string" use="optional"/>
- <xsd:attribute name="scope" type="aspectScope" use="optional"/>
- </xsd:complexType>
-
- <xsd:complexType name="interceptorType">
- <xsd:choice minOccurs="0" maxOccurs="1">
- <xsd:element name="class" type="xsd:anyType"/>
- <xsd:element name="factory" type="xsd:anyType"/>
- </xsd:choice>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="class" type="xsd:string" use="optional"/>
- <xsd:attribute name="factory" type="xsd:string" use="optional"/>
- <xsd:attribute name="scope" type="aspectScope" use="optional"/>
- </xsd:complexType>
-
- <xsd:complexType name="domainType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element name="interceptor" type="interceptorType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="introduction" type="introductionType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="metadata-loader" type="metadataLoaderType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="stack" type="stackType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="aspect" type="aspectType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="pointcut" type="pointcutType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="bind" type="bindType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="prepare" type="prepareType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="cflow-stack" type="cflowStackType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="dynamic-cflow" type="dynamicCflowType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="annotation" type="annotationType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="annotation-introduction" type="annotationIntroductionType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="typedef" type="typedefType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="domain" type="domainType" minOccurs="0"
- maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="aopType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
- Doco
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="interceptor" type="interceptorType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="introduction" type="introductionType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="metadata-loader" type="metadataLoaderType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="stack" type="stackType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="aspect" type="aspectType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="pointcut" type="pointcutType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="bind" type="bindType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="prepare" type="prepareType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="cflow-stack" type="cflowStackType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="dynamic-cflow" type="dynamicCflowType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="annotation" type="annotationType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="annotation-introduction" type="annotationIntroductionType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="typedef" type="typedefType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="domain" type="domainType" minOccurs="0"
- maxOccurs="unbounded"/>
- </xsd:choice>
- </xsd:complexType>
-
- <!-- The document root element -->
- <xsd:element name="aop" type="aopType">
- <xsd:annotation>
- <xsd:documentation> The root of the xml deployer instance document
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
-</xsd:schema>
Copied: projects/aop/trunk/aspects/src/test/java/org (from rev 82827, projects/aop/trunk/aspects/src/test/org)
Property changes on: projects/aop/trunk/aspects/src/test/java/org
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/aop/trunk/aspects/src/test/java/test (from rev 82827, projects/aop/trunk/aspects/src/test/test)
Property changes on: projects/aop/trunk/aspects/src/test/java/test
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/aop/trunk/aspects/src/test/resources/aop-deployer_1_1.xsd (from rev 82827, projects/aop/trunk/aspects/src/resources/aop-deployer_1_1.xsd)
===================================================================
--- projects/aop/trunk/aspects/src/test/resources/aop-deployer_1_1.xsd (rev 0)
+++ projects/aop/trunk/aspects/src/test/resources/aop-deployer_1_1.xsd 2009-01-13 21:04:12 UTC (rev 82829)
@@ -0,0 +1,415 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- A prototype xsd schema for the pojoserver xml deployer
+$Id$
+ -->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="urn:jboss:aop-deployer"
+ xmlns="urn:jboss:aop-deployer"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0">
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[
+ The xml deployer schema. The deployment document instance
+ root element should reference the schema in the root
+ deployment element using something like:
+
+ <aop
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:aop-deployer aop-deployer_1_1.xsd"
+ xmlns="urn:jboss:aop-deployer">
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:complexType name="typedefType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="expr" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="annotationType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="expr" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="annotationIntroductionType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="expr" type="xsd:string" use="required"/>
+ <xsd:attribute name="invisible" type="booleanType" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="dynamicCflowType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="class" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="cflowCalledType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="expr" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="cflowNotCalledType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="expr" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="cflowStackType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="called" type="cflowCalledType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="not-called" type="cflowNotCalledType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="bindType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="interceptor-ref" type="interceptorRefType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="stack-ref" type="stackRefType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="advice" type="adviceType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="optional"/>
+ <xsd:attribute name="pointcut" type="xsd:string" use="required"/>
+ <xsd:attribute name="cflow" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="pluggable-pointcut">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:any minOccurs="0" maxOccurs="1" namespace="##other"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="class" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="prepareType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="expr" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="pointcutType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="expr" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="interceptorRefType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="stackRefType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="adviceType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="aspect" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="stackType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="interceptor-ref" type="interceptorRefType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="stack-ref" type="stackRefType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="advice" type="adviceType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="metadata">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:any minOccurs="0" maxOccurs="1" namespace="##other"/>
+ </xsd:sequence>
+ <xsd:attribute name="tag" type="xsd:string" use="required"/>
+ <xsd:attribute name="class" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="metadataLoaderType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="tag" type="xsd:string" use="required"/>
+ <xsd:attribute name="class" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="mixinType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="interfaces" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+ <xsd:element name="class" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+ <xsd:element name="construction" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ </xsd:sequence>
+ <xsd:attribute name="transient" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="introductionType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="mixin" type="mixinType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="interfaces" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ </xsd:sequence>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ <xsd:attribute name="expr" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+
+ <xsd:simpleType name="aspectScope">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="PER_VM" />
+ <xsd:enumeration value="PER_CLASS" />
+ <xsd:enumeration value="PER_INSTANCE" />
+ <xsd:enumeration value="PER_JOINPOINT" />
+ <xsd:enumeration value="PER_CLASS_JOINPOINT" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="booleanType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="true" />
+ <xsd:enumeration value="false" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:complexType name="aspectType">
+ <xsd:choice minOccurs="0" maxOccurs="1">
+ <xsd:element name="class" type="xsd:anyType"/>
+ <xsd:element name="factory" type="xsd:anyType"/>
+ </xsd:choice>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ <xsd:attribute name="factory" type="xsd:string" use="optional"/>
+ <xsd:attribute name="scope" type="aspectScope" use="optional"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="interceptorType">
+ <xsd:choice minOccurs="0" maxOccurs="1">
+ <xsd:element name="class" type="xsd:anyType"/>
+ <xsd:element name="factory" type="xsd:anyType"/>
+ </xsd:choice>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ <xsd:attribute name="factory" type="xsd:string" use="optional"/>
+ <xsd:attribute name="scope" type="aspectScope" use="optional"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="domainType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="interceptor" type="interceptorType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="introduction" type="introductionType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="metadata-loader" type="metadataLoaderType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="stack" type="stackType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="aspect" type="aspectType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="pointcut" type="pointcutType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="bind" type="bindType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="prepare" type="prepareType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="cflow-stack" type="cflowStackType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="dynamic-cflow" type="dynamicCflowType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="annotation" type="annotationType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="annotation-introduction" type="annotationIntroductionType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="typedef" type="typedefType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="domain" type="domainType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="aopType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Doco
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="interceptor" type="interceptorType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="introduction" type="introductionType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="metadata-loader" type="metadataLoaderType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="stack" type="stackType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="aspect" type="aspectType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="pointcut" type="pointcutType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="bind" type="bindType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="prepare" type="prepareType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="cflow-stack" type="cflowStackType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="dynamic-cflow" type="dynamicCflowType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="annotation" type="annotationType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="annotation-introduction" type="annotationIntroductionType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="typedef" type="typedefType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="domain" type="domainType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:choice>
+ </xsd:complexType>
+
+ <!-- The document root element -->
+ <xsd:element name="aop" type="aopType">
+ <xsd:annotation>
+ <xsd:documentation> The root of the xml deployer instance document
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+</xsd:schema>
Property changes on: projects/aop/trunk/aspects/src/test/resources/aop-deployer_1_1.xsd
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Copied: projects/aop/trunk/aspects/src/test/resources/org (from rev 82827, projects/aop/trunk/aspects/src/resources/org)
Property changes on: projects/aop/trunk/aspects/src/test/resources/org
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/aop/trunk/aspects/src/test/resources/test (from rev 82827, projects/aop/trunk/aspects/src/resources/test)
Property changes on: projects/aop/trunk/aspects/src/test/resources/test
___________________________________________________________________
Name: svn:mergeinfo
+
More information about the jboss-cvs-commits
mailing list