[jboss-cvs] JBossAS SVN: r67552 - in trunk: build and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 28 07:11:31 EST 2007
Author: kabir.khan at jboss.com
Date: 2007-11-28 07:11:31 -0500 (Wed, 28 Nov 2007)
New Revision: 67552
Modified:
trunk/aspects/.classpath
trunk/aspects/build.xml
trunk/build/build-distr.xml
trunk/build/build-thirdparty.xml
trunk/testsuite/src/resources/aop/mcdefaultannotation/META-INF/jboss-beans.xml
trunk/testsuite/src/resources/aop/mcjmx/META-INF/has-dependency-beans.xml
Log:
[JBAS-4562]Upgrade to JBoss AOP 2.0.0.CR1
Modified: trunk/aspects/.classpath
===================================================================
--- trunk/aspects/.classpath 2007-11-28 10:12:01 UTC (rev 67551)
+++ trunk/aspects/.classpath 2007-11-28 12:11:31 UTC (rev 67552)
@@ -43,5 +43,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-managed.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-managed-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/ha/lib/jboss-ha-client.jar" sourcepath="/thirdparty/jboss/ha/lib/jboss-ha-client-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jboss4-jdk50.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/aspects/build.xml
===================================================================
--- trunk/aspects/build.xml 2007-11-28 10:12:01 UTC (rev 67551)
+++ trunk/aspects/build.xml 2007-11-28 12:11:31 UTC (rev 67552)
@@ -271,7 +271,7 @@
</jar>
<copy file="${project.root}/aspects/src/etc/base-aop.xml" tofile="${build.meta.inf}/base-aspects.xml"/>
-
+
<jar destfile="${build.lib}/jboss-aop-jboss5.deployer" manifest="${build.etc}/default.mf"
update="${jar.update}" index="${jar.index}">
<fileset file="${build.lib}/jboss-aspect-library-jdk50.jar"/>
@@ -282,13 +282,14 @@
</fileset>
</jar>
<delete dir="${build.meta.inf}"/>
-
+
<!-- FIXME Temporary until after JBoss AOP 2.0.0.beta2
1) Make jboss-aop-jboss4-jdk50.jar
2) Get rid of the org.jboss.aop.asintegration.jboss5 classes from jboss-aop-deployer-jdk50.jar
-
- Use these jars in build-distr.xml under 'ASPECTS'
+
+ Use these jars in build-distr.xml under 'ASPECTS'
-->
+ <!--
<mkdir dir="${build.lib}/temp"/>
<unjar dest="${build.lib}/temp" src="${jboss.aop.lib}/jboss-aop-deployer-jdk50.jar"/>
<jar destfile="${build.lib}/jboss-aop-jboss4-jdk50.jar" manifest="${build.lib}/temp/META-INF/MANIFEST.MF">
@@ -302,6 +303,7 @@
</fileset>
</jar>
<delete dir="${build.lib}/temp"/>
+ -->
</target>
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2007-11-28 10:12:01 UTC (rev 67551)
+++ trunk/build/build-distr.xml 2007-11-28 12:11:31 UTC (rev 67552)
@@ -4,9 +4,9 @@
]>
<project name="JBoss/Build">
-
+
&libraries;
-
+
<!-- ================================================================== -->
<!-- Module Pass-through Hooks -->
<!-- ================================================================== -->
@@ -211,41 +211,30 @@
<target name="_module-aspects-most">
<property name="_module.name" value="aspects" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<property name="aop.deployer" value="jboss-aop-jboss5.deployer"/>
<!-- Copy the generated libraries -->
<unjar src="${_module.output}/lib/${aop.deployer}" dest="${install.server}/all/deployers/${aop.deployer}"/>
-
+
<mkdir dir="${install.lib}"/>
- <!-- FIXME Temporary until after JBoss AOP 2.0.0.beta2
- Should use the jboss.aop.lib version
<copy todir="${install.lib}" filtering="no">
- <fileset dir="${jboss.aop.lib}">
- <include name="jboss-aop-deployer-jdk50.jar"/>
- </fileset>
+ <fileset dir="${jboss.aop.lib}">
+ <include name="jboss-aop-deployer-jdk50.jar"/>
+ </fileset>
</copy>
- -->
+
<copy todir="${install.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-aop-deployer-jdk50.jar"/>
- </fileset>
- </copy>
-
- <!-- FIXME Temporary until after JBoss AOP 2.0.0.beta2
- Should use the jboss.aop.lib versions
- -->
- <copy todir="${install.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
+ <fileset dir="${jboss.aop.lib}">
<include name="jboss-aop-jboss4-jdk50.jar"/>
</fileset>
</copy>
-
+
<copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-aop-jboss5.jar"/>
</fileset>
</copy>
-
+
<!-- Copy across client jars -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -594,20 +583,20 @@
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
<mkdir dir="${install.server}/all/deployers"/>
-
+
<copy todir="${install.server}/all/deployers" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-jca.deployer/**"/>
</fileset>
</copy>
-
+
<!-- FIXME when Tomcat is fixed -->
<copy todir="${install.server}/all/deployers" filtering="no">
<fileset dir="${_module.output}/resources/deployers">
<include name="jca-hack-for-tomcat-service.xml"/>
</fileset>
</copy>
-
+
<!--
<copy todir="${install.server}/all/deployers" filtering="no">
<fileset dir="${_module.output}/resources/deployers">
@@ -615,7 +604,7 @@
</fileset>
</copy>
-->
-
+
<!-- Copy the generated deployment libraries -->
<mkdir dir="${install.server}/all/deploy"/>
<copy todir="${install.server}/all/deploy" filtering="no">
@@ -950,7 +939,7 @@
<property name="_module.name" value="security" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.all.lib}" filtering="no">
@@ -1090,7 +1079,7 @@
<include name="threaddump.war"/>
</fileset>
</copy>
-
+
<mkdir dir="${install.examples}/jmx/persistent-service.sar"/>
<unjar src="${_module.output}/lib/persistent-service.sar" dest="${install.examples}/jmx/persistent-service.sar"/>
@@ -1617,7 +1606,7 @@
<!-- Install jbossws.deployer -->
<mkdir dir="${install.all.deployers}/jbossws.deployer"/>
<unzip dest="${install.all.deployers}/jbossws.deployer" src="${_module.output}/lib/jbossws-jboss50-deployer.zip"/>
-
+
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -1765,7 +1754,7 @@
<include name="sunxacml-support.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
@@ -1827,9 +1816,9 @@
<fileset dir="${sun.jaf.lib}">
<include name="activation.jar"/>
</fileset>
-
+
</copy>
-
+
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -1942,7 +1931,7 @@
<include name="policy.jar"/>
</fileset>
</copy>
-
+
<!-- Copy thirdparty code to lib/endorsed -->
<mkdir dir="${install.lib}/endorsed"/>
<copy todir="${install.lib}/endorsed" filtering="no">
@@ -1959,7 +1948,7 @@
<include name="jaxb-api.jar"/>
</fileset>
</copy>
-
+
<!-- Copy thirdparty code to server/all/lib -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${apache.logging.lib}">
@@ -2005,7 +1994,7 @@
<include name="schema/*"/>
</patternset>
</unzip>
-
+
<!-- copy binary release of JBossTS from thirdparty repo -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
@@ -2015,11 +2004,11 @@
</fileset>
</copy>
<copy todir="${install.all.conf}" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjta-properties.xml"/>
-
+
<!-- Install jbossws.sar -->
<mkdir dir="${install.all.deploy}/jbossws.sar"/>
<unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.native50.lib}/jbossws-native50.sar"/>
-
+
<!-- Install jbossws tools shell scripts -->
<unzip dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-client.jar">
<patternset>
@@ -2033,7 +2022,7 @@
<include name="wsconsume.*"/>
</patternset>
</unzip>
-
+
<chmod perm="+x">
<fileset dir="${install.bin}">
<include name="wstools.sh"/>
@@ -2042,6 +2031,6 @@
<include name="wsrunclient.sh"/>
</fileset>
</chmod>
-
+
</target>
</project>
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2007-11-28 10:12:01 UTC (rev 67551)
+++ trunk/build/build-thirdparty.xml 2007-11-28 12:11:31 UTC (rev 67552)
@@ -83,7 +83,7 @@
<componentref name="jacorb" version="2.3.0jboss.patch5-brew"/>
<componentref name="javassist" version="3.6.0.GA"/>
<componentref name="jaxen" version="1.1-brew"/>
- <componentref name="jboss/aop" version="2.0.0.beta2"/>
+ <componentref name="jboss/aop" version="2.0.0.CR1"/>
<componentref name="jboss/cache" version="2.0.0.GA"/>
<componentref name="jboss/common-core" version="2.2.2.GA"/>
<componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/>
Modified: trunk/testsuite/src/resources/aop/mcdefaultannotation/META-INF/jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/aop/mcdefaultannotation/META-INF/jboss-beans.xml 2007-11-28 10:12:01 UTC (rev 67551)
+++ trunk/testsuite/src/resources/aop/mcdefaultannotation/META-INF/jboss-beans.xml 2007-11-28 12:11:31 UTC (rev 67552)
@@ -5,10 +5,13 @@
name="DependencyAdvice"
class="org.jboss.test.aop.mcdefaultannotation.AnnotationReaderInterceptor"
manager-bean="AspectManager"
- manager-property="aspectManager"
- pointcut="execution(* @org.jboss.test.aop.mcdefaultannotation.TestAnnotation->getAnnotationValue())">
+ manager-property="aspectManager">
</aop:aspect>
+ <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.aop.mcdefaultannotation.TestAnnotation->getAnnotationValue())">
+ <aop:interceptor-ref name="DependencyAdvice"/>
+ </aop:bind>
+
<bean name="TestAOPBean" class="org.jboss.test.aop.mcdefaultannotation.MyBean">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.aop:name=Bean", exposedInterface=org.jboss.test.aop.mcdefaultannotation.BeanInterface.class)</annotation>
<annotation>@org.jboss.test.aop.mcdefaultannotation.TestAnnotation</annotation>
Modified: trunk/testsuite/src/resources/aop/mcjmx/META-INF/has-dependency-beans.xml
===================================================================
--- trunk/testsuite/src/resources/aop/mcjmx/META-INF/has-dependency-beans.xml 2007-11-28 10:12:01 UTC (rev 67551)
+++ trunk/testsuite/src/resources/aop/mcjmx/META-INF/has-dependency-beans.xml 2007-11-28 12:11:31 UTC (rev 67552)
@@ -6,11 +6,14 @@
name="DependencyAdvice"
class="org.jboss.test.aop.mcjmx.InterceptorWithDependency"
manager-bean="AspectManager"
- manager-property="aspectManager"
- pointcut="execution(* org.jboss.test.aop.mcjmx.BeanWithDependency->someAction(..))">
+ manager-property="aspectManager">
<property name="dependency"><inject bean="Dependency"/></property>
</aop:aspect>
+ <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.aop.mcjmx.BeanWithDependency->someAction(..))">
+ <aop:interceptor-ref name="DependencyAdvice"/>
+ </aop:bind>
+
<bean name="BeanWithDependency" class="org.jboss.test.aop.mcjmx.BeanWithDependency"/>
-
+
</deployment>
More information about the jboss-cvs-commits
mailing list