[jboss-cvs] JBossAS SVN: r65071 - in trunk/tomcat/src: resources/META-INF and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2007-09-04 19:04:03 -0400 (Tue, 04 Sep 2007)
New Revision: 65071

Removed:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/AopMarker.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/InstanceOfAopMarker.java
Modified:
   trunk/tomcat/src/resources/META-INF/jboss-aop.xml
Log:
[JBAS-4670] Remove support for AopMarker and InstanceOfAopMarker marker interfaces

Deleted: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/AopMarker.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/AopMarker.java	2007-09-04 22:20:34 UTC (rev 65070)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/AopMarker.java	2007-09-04 23:04:03 UTC (rev 65071)
@@ -1,31 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.web.tomcat.service.session;
-
-/**
- * Marker interface for use in aop annotation declaration. For example, can use this in pojo
- * annotation instead of declaring jboss-aop.xml. For a pojo annotation declaration, just declare
- * this in the pojo class level, and then there is a corresponding jboss-aop.xml that is needed.
- * @author Ben Wang
- */
-public interface AopMarker {
-}

Deleted: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/InstanceOfAopMarker.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/InstanceOfAopMarker.java	2007-09-04 22:20:34 UTC (rev 65070)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/InstanceOfAopMarker.java	2007-09-04 23:04:03 UTC (rev 65071)
@@ -1,31 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.web.tomcat.service.session;
-
-/**
- * Marker interface for use in aop annotation declaration. For example, can use this in pojo
- * annotation instead of declaring jboss-aop.xml. For a pojo annotation declaration, just declare
- * this in the pojo class level, and then there is a corresponding jboss-aop.xml that is needed.
- * @author Ben Wang
- */
-public interface InstanceOfAopMarker {
-}

Modified: trunk/tomcat/src/resources/META-INF/jboss-aop.xml
===================================================================
--- trunk/tomcat/src/resources/META-INF/jboss-aop.xml	2007-09-04 22:20:34 UTC (rev 65070)
+++ trunk/tomcat/src/resources/META-INF/jboss-aop.xml	2007-09-04 23:04:03 UTC (rev 65071)
@@ -16,37 +16,5 @@
          <construction>new org.jboss.aspects.patterns.observable.SubjectImpl(this)</construction>
       </mixin>
    </introduction>
-
-   <!-- If a POJO has AopMarker annotation, it will be aspectized. -->
-   <prepare expr="field(* @org.jboss.web.tomcat.service.session.AopMarker->*)" />
-
-   <!-- Make any POJO with a AopMarker annotation as a Subject/Observerable -->
-   <bind pointcut="set(* @org.jboss.web.tomcat.service.session.AopMarker->*)">
-      <interceptor class="org.jboss.aspects.patterns.observable.SubjectInterceptor"/>
-   </bind>
-
-   <introduction class="@org.jboss.web.tomcat.service.session.AopMarker">
-      <mixin>
-         <interfaces>org.jboss.aspects.patterns.observable.Subject</interfaces>
-         <class>org.jboss.aspects.patterns.observable.SubjectImpl</class>
-         <construction>new org.jboss.aspects.patterns.observable.SubjectImpl(this)</construction>
-      </mixin>
-   </introduction>
   
-   <!-- If a POJO has InstanceOfAopMarker annotation, it will be aspectized. -->
-   <prepare expr="field(* $instanceof{@org.jboss.web.tomcat.service.session.InstanceOfAopMarker}->*)" />
-
-   <!-- Make any POJO with a AopMarker annotation as a Subject/Observerable -->
-   <bind pointcut="set(* @org.jboss.web.tomcat.service.session.InstanceOfAopMarker->*)">
-      <interceptor class="org.jboss.aspects.patterns.observable.SubjectInterceptor"/>
-   </bind>
-
-   <introduction class="@org.jboss.web.tomcat.service.session.InstanceOfAopMarker">
-      <mixin>
-         <interfaces>org.jboss.aspects.patterns.observable.Subject</interfaces>
-         <class>org.jboss.aspects.patterns.observable.SubjectImpl</class>
-         <construction>new org.jboss.aspects.patterns.observable.SubjectImpl(this)</construction>
-      </mixin>
-   </introduction>
-  
 </aop>