[jboss-cvs] JBossAS SVN: r62995 - in projects/aop/trunk/asintegration/src: resources and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 11 12:15:59 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-05-11 12:15:59 -0400 (Fri, 11 May 2007)
New Revision: 62995
Removed:
projects/aop/trunk/asintegration/src/etc/base-aop.xml
projects/aop/trunk/asintegration/src/resources/aop-deployer_1_1.xsd
Log:
[JBAOP-397] Make JBossAspectLibrary maintained by this source location
Get rid of things maintained by the application server
Deleted: projects/aop/trunk/asintegration/src/etc/base-aop.xml
===================================================================
--- projects/aop/trunk/asintegration/src/etc/base-aop.xml 2007-05-11 16:14:37 UTC (rev 62994)
+++ projects/aop/trunk/asintegration/src/etc/base-aop.xml 2007-05-11 16:15:59 UTC (rev 62995)
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE aop PUBLIC
- "-//JBoss//DTD JBOSS AOP 1.0//EN"
- "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
-
-<aop>
- <!-- custom configuration for AOP Security -->
- <metadata-loader tag="security" class="org.jboss.aspects.security.SecurityClassMetaDataLoader"/>
-
- <stack name="J2EESecurityStack">
- <interceptor factory="org.jboss.aspects.security.AuthenticationInterceptorFactory" scope="PER_CLASS"/>
- <interceptor factory="org.jboss.aspects.security.RoleBasedAuthorizationInterceptorFactory" scope="PER_CLASS"/>
- <interceptor factory="org.jboss.aspects.security.RunAsSecurityInterceptorFactory" scope="PER_CLASS"/>
- </stack>
-
- <bind pointcut="all(@security)">
- <stack-ref name="J2EESecurityStack"/>
- </bind>
-
- <bind pointcut="all(@org.jboss.aspects.security.Permissions)">
- <stack-ref name="J2EESecurityStack"/>
- </bind>
-
- <bind pointcut="all(@org.jboss.aspects.security.Unchecked)">
- <stack-ref name="J2EESecurityStack"/>
- </bind>
-
- <bind pointcut="all(@org.jboss.aspects.security.Exclude)">
- <stack-ref name="J2EESecurityStack"/>
- </bind>
-
- <introduction expr="class(@org.jboss.aspects.jmx.MBean)">
- <mixin>
- <interfaces>javax.management.DynamicMBean</interfaces>
- <class>org.jboss.aspects.jmx.JmxIntrospectingMixin</class>
- <construction>new org.jboss.aspects.jmx.JmxIntrospectingMixin(this)</construction>
- </mixin>
- </introduction>
-
- <!-- asynchronous aspect -->
- <aspect class="org.jboss.aspects.asynch.AsynchAspect" scope="PER_INSTANCE">
- <advisor-attribute name="Advisor"/>
- </aspect>
-
- <bind pointcut="execution(!static * *->@org.jboss.aspects.asynch.Asynchronous(..))">
- <advice name="execute" aspect="org.jboss.aspects.asynch.AsynchAspect"/>
- </bind>
-
- <introduction expr="has(!static * *->@org.jboss.aspects.asynch.Asynchronous(..))">
- <mixin>
- <interfaces>org.jboss.aspects.asynch.AsynchProvider,org.jboss.aspects.asynch.FutureHolder</interfaces>
- <class>org.jboss.aspects.asynch.AsynchMixin</class>
- </mixin>
- </introduction>
-
- <!-- old asynch aspect from Claude -->
-
- <aspect class="org.jboss.aspects.asynchronous.aspects.jboss.AsynchronousAspect" scope="PER_VM"/>
-
- <bind pointcut="execution(* *->@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous(..))">
- <advice name="execute" aspect="org.jboss.aspects.asynchronous.aspects.jboss.AsynchronousAspect"/>
- </bind>
-
- <introduction expr="has(* *->@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous(..)) OR class(@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous)">
-
- <mixin>
- <interfaces>
- org.jboss.aspects.asynchronous.aspects.AsynchronousFacade
- </interfaces>
- <class>org.jboss.aspects.asynchronous.aspects.AsynchronousFacadeImpl</class>
- <construction>new org.jboss.aspects.asynchronous.aspects.AsynchronousFacadeImpl()</construction>
- </mixin>
- </introduction>
-
- <!-- TRANSACTIONS -->
- <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
- <interceptor factory="org.jboss.aspects.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
-
- <bind pointcut="all(@transaction)">
- <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
- </bind>
-
- <interceptor name="class-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory" scope="PER_CLASS"/>
- <interceptor name="instance-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory" scope="PER_INSTANCE"/>
-
- <bind pointcut="execution(static * *->@TxSynchronized(..)) OR execution(*->@TxSynchronized(..))">
- <interceptor-ref name="class-txsynchronized"/>
- </bind>
-
- <bind pointcut="execution(!static * *->@TxSynchronized(..))">
- <interceptor-ref name="instance-txsynchronized"/>
- </bind>
-
- <bind pointcut="all(@org.jboss.aspects.tx.Tx)">
- <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
- </bind>
-
- <bind pointcut="execution(static * *->@org.jboss.aspects.txlock.TxSynchronized(..)) OR execution(*->@org.jboss.aspects.txlock.TxSynchronized(..))">
- <interceptor-ref name="class-txsynchronized"/>
- </bind>
-
- <bind pointcut="execution(!static * *->@org.jboss.aspects.txlock.TxSynchronized(..))">
- <interceptor-ref name="instance-txsynchronized"/>
- </bind>
-
- <!-- injection -->
- <aspect class="org.jboss.aspects.tx.TransactionInjector"/>
- <aspect class="org.jboss.aspects.tx.TransactionManagerInjector"/>
-
- <bind pointcut="field(javax.transaction.Transaction *->@org.jboss.aspects.Current)">
- <advice name="access" aspect="org.jboss.aspects.tx.TransactionInjector"/>
- </bind>
-
- <bind pointcut="field(javax.transaction.TransactionManager *->@org.jboss.aspects.Injected)">
- <advice name="access" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/>
- </bind>
-
- <bind pointcut="execution(*->new(..)) AND hasfield(javax.transaction.TransactionManager *->@org.jboss.aspects.Injected)">
- <advice name="allocation" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/>
- </bind>
-
- <!-- special types -->
- <aspect class="org.jboss.aspects.ThreadbasedAspect" scope="PER_JOINPOINT"/>
- <bind pointcut="field(* *->@org.jboss.aspects.Threadbased)">
- <advice name="access" aspect="org.jboss.aspects.ThreadbasedAspect"/>
- </bind>
-
- <aspect class="org.jboss.aspects.tx.TransactionLocalAspect" scope="PER_JOINPOINT"/>
- <bind pointcut="field(* *->@org.jboss.aspects.tx.TxLocal)">
- <advice name="access" aspect="org.jboss.aspects.tx.TransactionLocalAspect"/>
- </bind>
-
-</aop>
Deleted: projects/aop/trunk/asintegration/src/resources/aop-deployer_1_1.xsd
===================================================================
--- projects/aop/trunk/asintegration/src/resources/aop-deployer_1_1.xsd 2007-05-11 16:14:37 UTC (rev 62994)
+++ projects/aop/trunk/asintegration/src/resources/aop-deployer_1_1.xsd 2007-05-11 16:15:59 UTC (rev 62995)
@@ -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>
More information about the jboss-cvs-commits
mailing list