[jboss-cvs] JBossAS SVN: r105817 - in trunk: cluster/src/etc and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 8 15:41:50 EDT 2010
Author: bstansberry at jboss.com
Date: 2010-06-08 15:41:49 -0400 (Tue, 08 Jun 2010)
New Revision: 105817
Added:
trunk/cluster/src/etc/pojocache-aop.xml
Removed:
trunk/tomcat/src/assembly/jbossweb-cluster-aop.xml
trunk/tomcat/src/resources/META-INF/
Modified:
trunk/build/build.xml
trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml
trunk/tomcat/pom.xml
Log:
[JBAS-8085] Clean up jbossweb-cluster.aop
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-06-08 19:14:21 UTC (rev 105816)
+++ trunk/build/build.xml 2010-06-08 19:41:49 UTC (rev 105817)
@@ -1152,6 +1152,7 @@
<include name="ha-legacy-jboss-beans.xml"/>
<include name="timestamps-jboss-beans.xml"/>
<include name="farm-deployment-jboss-beans.xml"/>
+ <include name="pojocache-aop.xml"/>
</fileset>
</copy>
<mkdir dir="${install.server}/all/deploy/cluster/jgroups-channelfactory.sar"/>
@@ -1440,7 +1441,6 @@
<!-- Copy the clustering service elements -->
<copy todir="${install.server}/all/deploy">
<fileset dir="${tomcat.module.output}/deploy">
- <include name="cluster/**"/>
<!-- Copy the mod_cluster.sar -->
<include name="mod_cluster.sar/**"/>
</fileset>
Copied: trunk/cluster/src/etc/pojocache-aop.xml (from rev 105807, trunk/tomcat/src/resources/META-INF/jboss-aop.xml)
===================================================================
--- trunk/cluster/src/etc/pojocache-aop.xml (rev 0)
+++ trunk/cluster/src/etc/pojocache-aop.xml 2010-06-08 19:41:49 UTC (rev 105817)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aop xmlns="urn:jboss:aop-beans:1.0">
+
+ <!--======================================================================-->
+ <!-- Deploys the aspects needed for use of POJO Cache. -->
+ <!-- Deprecated. POJO Cache will be removed from a future release. -->
+ <!-- The standard application services do not use POJO Cache, so this -->
+ <!-- file can be removed if end user services do not require POJO Cache. -->
+ <!--======================================================================-->
+
+ <!-- If a POJO has Replicable annotation, it will be aspectized. -->
+ <!--
+ Supports inheritance and polymorphism. It can either be a concrete class
+ or an interface. All sub-classes or interface implementors will be instrumeneted.
+ -->
+ <prepare expr="field(* $instanceof{@org.jboss.cache.pojo.annotation.Replicable}->*)" />
+
+ <!-- Work around that ensures annotated classes which do not access fields are instrumented -->
+ <introduction expr="class($instanceof{@org.jboss.cache.pojo.annotation.Replicable})"/>
+
+ <!-- Array support -->
+ <!-- Comment entire section to disable -->
+ <arrayreplacement expr="class($instanceof{@org.jboss.cache.pojo.annotation.Replicable})"/>
+ <interceptor name="pojocache-array" class="org.jboss.cache.pojo.interceptors.dynamic.ArrayInterceptor"/>
+ <introduction expr="class($instanceof{@org.jboss.cache.pojo.annotation.Replicable})">
+ <interfaces>org.jboss.cache.pojo.impl.ArrayInterceptable</interfaces>
+ </introduction>
+ <arraybind name="pojocache-array-binding" type="READ_WRITE">
+ <interceptor-ref name="pojocache-array"/>
+ </arraybind>
+
+</aop>
Modified: trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml 2010-06-08 19:14:21 UTC (rev 105816)
+++ trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml 2010-06-08 19:41:49 UTC (rev 105817)
@@ -116,16 +116,6 @@
</entry>
<!-- all -->
<entry>
- <key>cluster</key>
- <value>
- <set>
- <value>jboss-cache-manager.sar</value>
- <value>jbossweb-cluster.aop</value>
- <value>jgroups-channelfactory.sar</value>
- </set>
- </value>
- </entry>
- <entry>
<key>snmp-adaptor.sar</key>
<value><null/></value>
</entry>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2010-06-08 19:14:21 UTC (rev 105816)
+++ trunk/tomcat/pom.xml 2010-06-08 19:41:49 UTC (rev 105817)
@@ -121,16 +121,6 @@
<copy file="target/${project.build.finalName}-jboss-web-service.jar"
tofile="${output.deploy}/jbossweb.sar/jboss-web-service.jar"/>
-
- <!-- jar for fine grained aop -->
- <!-- package in .aop. This is used for fine-grained replication -->
- <copy file="target/${project.build.finalName}-jbossweb-cluster-aop.jar"
- tofile="${output.lib}/jbossweb-cluster.aop"/>
-
- <!-- Cluster caches and aop descriptor used for fine-grained replication -->
- <mkdir dir="${output.deploy}/cluster"/>
- <copy todir="${output.deploy}/cluster"
- file="${output.lib}/jbossweb-cluster.aop"/>
<!-- mod_cluster service -->
<mkdir dir="${output.deploy}/mod_cluster.sar/META-INF"/>
Deleted: trunk/tomcat/src/assembly/jbossweb-cluster-aop.xml
===================================================================
--- trunk/tomcat/src/assembly/jbossweb-cluster-aop.xml 2010-06-08 19:14:21 UTC (rev 105816)
+++ trunk/tomcat/src/assembly/jbossweb-cluster-aop.xml 2010-06-08 19:41:49 UTC (rev 105817)
@@ -1,16 +0,0 @@
-<assembly>
- <id>jbossweb-cluster-aop</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src/resources</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>META-INF/jboss-aop.xml</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list