[jboss-cvs] JBossAS SVN: r60213 - in branches/Branch_4_2/tomcat: src/main/org/jboss/web/tomcat/service/session and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 2 15:56:28 EST 2007
Author: bstansberry at jboss.com
Date: 2007-02-02 15:56:28 -0500 (Fri, 02 Feb 2007)
New Revision: 60213
Added:
branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/tc5/session/AopMarker.java
branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/tc5/session/InstanceOfAopMarker.java
Removed:
branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/AopMarker.java
branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/InstanceOfAopMarker.java
Modified:
branches/Branch_4_2/tomcat/build.xml
branches/Branch_4_2/tomcat/src/resources/META-INF/jboss-aop.xml
Log:
[JBAS-4050] Restore the org.jboss.web.tomcat.tc5.session FIELD granularity marker interfaces
Modified: branches/Branch_4_2/tomcat/build.xml
===================================================================
--- branches/Branch_4_2/tomcat/build.xml 2007-02-02 20:56:22 UTC (rev 60212)
+++ branches/Branch_4_2/tomcat/build.xml 2007-02-02 20:56:28 UTC (rev 60213)
@@ -270,8 +270,8 @@
<!-- package in .aop. This is used for fine-grained replication -->
<jar destfile="${build.lib}/jboss-web-cluster.aop">
<fileset dir="${build.classes}">
- <include name="org/jboss/web/tomcat/service/session/AopMarker.class"/>
- <include name="org/jboss/web/tomcat/service/session/InstanceOfAopMarker.class"/>
+ <include name="org/jboss/web/tomcat/tc5/session/AopMarker.class"/>
+ <include name="org/jboss/web/tomcat/tc5/session/InstanceOfAopMarker.class"/>
</fileset>
<fileset dir="${build.resources}">
<include name="META-INF/jboss-aop.xml"/>
Deleted: branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/AopMarker.java
===================================================================
--- branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/AopMarker.java 2007-02-02 20:56:22 UTC (rev 60212)
+++ branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/AopMarker.java 2007-02-02 20:56:28 UTC (rev 60213)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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: branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/InstanceOfAopMarker.java
===================================================================
--- branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/InstanceOfAopMarker.java 2007-02-02 20:56:22 UTC (rev 60212)
+++ branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/InstanceOfAopMarker.java 2007-02-02 20:56:28 UTC (rev 60213)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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 {
-}
Copied: branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/tc5/session/AopMarker.java (from rev 59898, branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/AopMarker.java)
===================================================================
--- branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/tc5/session/AopMarker.java (rev 0)
+++ branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/tc5/session/AopMarker.java 2007-02-02 20:56:28 UTC (rev 60213)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.tc5.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
+ *
+ * @deprecated use org.jboss.cache.aop.annotation.PojoCacheable (JDK5)
+ * or org.jboss.cache.aop.AopMarker (JDK 1.4 based builds). Will
+ * be removed in the next minor and major JBoss AS releases.
+ */
+public interface AopMarker {
+}
Copied: branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/tc5/session/InstanceOfAopMarker.java (from rev 59898, branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/session/InstanceOfAopMarker.java)
===================================================================
--- branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/tc5/session/InstanceOfAopMarker.java (rev 0)
+++ branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/tc5/session/InstanceOfAopMarker.java 2007-02-02 20:56:28 UTC (rev 60213)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.tc5.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
+ *
+ * @deprecated use org.jboss.cache.aop.annotation.InstanceOfPojoCacheable (JDK5)
+ * or org.jboss.cache.aop.InstanceOfAopMarker (JDK 1.4 based builds).
+ * Will be removed in the next minor and major JBoss AS releases
+ */
+public interface InstanceOfAopMarker {
+}
Modified: branches/Branch_4_2/tomcat/src/resources/META-INF/jboss-aop.xml
===================================================================
--- branches/Branch_4_2/tomcat/src/resources/META-INF/jboss-aop.xml 2007-02-02 20:56:22 UTC (rev 60212)
+++ branches/Branch_4_2/tomcat/src/resources/META-INF/jboss-aop.xml 2007-02-02 20:56:28 UTC (rev 60213)
@@ -1,21 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<aop>
- <!-- With this declaration, FieldBasedClusteredSession will implement the
- Observable interface to receive the event.
+ <!-- Prepare classes for DynamicAop so PojoCache can add interceptors.
+ Also, add a Subject mixin. With this mixin, FieldBasedClusteredSession
+ (which implements the Observable interface) can receive events when
+ contained pojos are changed.
Note that this file is bundled in jboss-web-cluster.aop. The aop package
is needed such that a user doesn't depend on JBossCache library.
-->
- <!-- If a POJO has AopMarker annotation, it will be aspectized. -->
- <prepare expr="field(* @org.jboss.web.tomcat.service.session.AopMarker->*)" />
+ <!-- If a POJO has the deprecated TC5 AopMarker interface, it will be aspectized. -->
+ <prepare expr="field(* @org.jboss.web.tomcat.tc5.session.AopMarker->*)" />
- <!-- Make any POJO with a AopMarker annotation as a Subject/Observerable -->
- <bind pointcut="set(* @org.jboss.web.tomcat.service.session.AopMarker->*)">
+ <!-- Make any POJO with the deprecated TC5 AopMarker interface as a Subject/Observerable -->
+ <bind pointcut="set(* @org.jboss.web.tomcat.tc5.session.AopMarker->*)">
<interceptor class="org.jboss.aspects.patterns.observable.SubjectInterceptor"/>
</bind>
- <introduction class="@org.jboss.web.tomcat.service.session.AopMarker">
+ <introduction class="@org.jboss.web.tomcat.tc5.session.AopMarker">
<mixin>
<interfaces>org.jboss.aspects.patterns.observable.Subject</interfaces>
<class>org.jboss.aspects.patterns.observable.SubjectImpl</class>
@@ -23,15 +25,15 @@
</mixin>
</introduction>
- <!-- If a POJO has InstanceOfAopMarker annotation, it will be aspectized. -->
- <prepare expr="field(* $instanceof{@org.jboss.web.tomcat.service.session.InstanceOfAopMarker}->*)" />
+ <!-- If a POJO has the deprecated TC5 InstanceOfAopMarker interface, it will be aspectized. -->
+ <prepare expr="field(* $instanceof{@org.jboss.web.tomcat.tc5.session.InstanceOfAopMarker}->*)" />
- <!-- Make any POJO with a AopMarker annotation as a Subject/Observerable -->
- <bind pointcut="set(* @org.jboss.web.tomcat.service.session.InstanceOfAopMarker->*)">
+ <!-- Make any POJO with the deprecated TC5 InstanceOfAopMarker interface as a Subject/Observerable -->
+ <bind pointcut="set(* @org.jboss.web.tomcat.tc5.session.InstanceOfAopMarker->*)">
<interceptor class="org.jboss.aspects.patterns.observable.SubjectInterceptor"/>
</bind>
- <introduction class="@org.jboss.web.tomcat.service.session.InstanceOfAopMarker">
+ <introduction class="@org.jboss.web.tomcat.tc5.session.InstanceOfAopMarker">
<mixin>
<interfaces>org.jboss.aspects.patterns.observable.Subject</interfaces>
<class>org.jboss.aspects.patterns.observable.SubjectImpl</class>
@@ -39,10 +41,11 @@
</mixin>
</introduction>
- <!-- If a POJO has PojoCacheable annotation, it will be aspectized. -->
+
+ <!-- If a POJO has JDK5 PojoCacheable annotation, it will be aspectized. -->
<prepare expr="field(* @org.jboss.cache.aop.annotation.PojoCacheable->*)" />
- <!-- Make any POJO with a AopMarker annotation as a Subject/Observerable -->
+ <!-- Make any POJO with a JDK5 PojoCacheable annotation as a Subject/Observerable -->
<bind pointcut="set(* @org.jboss.cache.aop.annotation.PojoCacheable->*)">
<interceptor class="org.jboss.aspects.patterns.observable.SubjectInterceptor"/>
</bind>
@@ -55,10 +58,10 @@
</mixin>
</introduction>
- <!-- If a POJO has InstanceOfPojoCacheable annotation, it will be aspectized. -->
+ <!-- If a POJO has JDK5 InstanceOfPojoCacheable annotation, it will be aspectized. -->
<prepare expr="field(* $instanceof{@org.jboss.cache.aop.annotation.InstanceOfPojoCacheable}->*)" />
- <!-- Make any POJO with a AopMarker annotation as a Subject/Observerable -->
+ <!-- Make any POJO with a JDK5 InstanceOfPojoCacheable annotation as a Subject/Observerable -->
<bind pointcut="set(* @org.jboss.cache.aop.annotation.InstanceOfPojoCacheable->*)">
<interceptor class="org.jboss.aspects.patterns.observable.SubjectInterceptor"/>
</bind>
More information about the jboss-cvs-commits
mailing list