[jboss-cvs] JBossAS SVN: r80116 - in projects/demos/microcontainer/trunk: bootstrap and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 27 12:25:49 EDT 2008
Author: alesj
Date: 2008-10-27 12:25:49 -0400 (Mon, 27 Oct 2008)
New Revision: 80116
Modified:
projects/demos/microcontainer/trunk/bootstrap/pom.xml
projects/demos/microcontainer/trunk/classloading/pom.xml
projects/demos/microcontainer/trunk/jmx/pom.xml
projects/demos/microcontainer/trunk/jmx/src/main/resources/META-INF/aop-beans.xml
projects/demos/microcontainer/trunk/pom.xml
Log:
Update aop and its int parts.
Add excludes to poms.
Modified: projects/demos/microcontainer/trunk/bootstrap/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/bootstrap/pom.xml 2008-10-27 16:25:09 UTC (rev 80115)
+++ projects/demos/microcontainer/trunk/bootstrap/pom.xml 2008-10-27 16:25:49 UTC (rev 80116)
@@ -81,10 +81,6 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-system-jmx</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: projects/demos/microcontainer/trunk/classloading/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/classloading/pom.xml 2008-10-27 16:25:09 UTC (rev 80115)
+++ projects/demos/microcontainer/trunk/classloading/pom.xml 2008-10-27 16:25:49 UTC (rev 80116)
@@ -76,10 +76,6 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-system-jmx</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: projects/demos/microcontainer/trunk/jmx/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/jmx/pom.xml 2008-10-27 16:25:09 UTC (rev 80115)
+++ projects/demos/microcontainer/trunk/jmx/pom.xml 2008-10-27 16:25:49 UTC (rev 80116)
@@ -73,12 +73,20 @@
<artifactId>jboss-aop</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-mc</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-jmx</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
+ <artifactId>jboss-as-system-jmx</artifactId>
</dependency>
</dependencies>
Modified: projects/demos/microcontainer/trunk/jmx/src/main/resources/META-INF/aop-beans.xml
===================================================================
--- projects/demos/microcontainer/trunk/jmx/src/main/resources/META-INF/aop-beans.xml 2008-10-27 16:25:09 UTC (rev 80115)
+++ projects/demos/microcontainer/trunk/jmx/src/main/resources/META-INF/aop-beans.xml 2008-10-27 16:25:49 UTC (rev 80116)
@@ -6,17 +6,12 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- Integration -->
- <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/>
- <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration">
- <property name="scopingPolicy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
- </bean>
+ <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration"/>
- <!-- For use once the aop-mc-int metadata stuff goes live
<bean name="DefaultAspectManager" class="org.jboss.aop.microcontainer.beans.metadata.DefaultAspectManager">
- <property name="managerBean">AspectManager</property>
+ <property name="managerBean">AspectManagerJDK5</property>
<property name="managerProperty">aspectManager</property>
</bean>
- -->
<!--
Valid values for the AspectManager bean for use with enableTransformer=true are:
@@ -89,10 +84,4 @@
<property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
</lifecycle-install>
- <!-- MBean for making sure that the underlying AspectManagerService gets registered in JMX -->
- <bean name="AspectManagerJMXRegistrar" class="org.jboss.aop.deployers.AspectManagerJMXRegistrar">
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <property name="aspectManager"><inject bean="AspectManagerJDK5"/></property>
- </bean>
-
</deployment>
Modified: projects/demos/microcontainer/trunk/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/pom.xml 2008-10-27 16:25:09 UTC (rev 80115)
+++ projects/demos/microcontainer/trunk/pom.xml 2008-10-27 16:25:49 UTC (rev 80116)
@@ -307,16 +307,70 @@
<version>${version.jboss.aop}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-core</artifactId>
+ <version>${version.jboss.aop}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-jmx</artifactId>
+ <version>${version.jboss.aop}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-j2se</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-mc</artifactId>
+ <version>${version.jboss.aop}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-system-jmx</artifactId>
<version>${version.jboss.jbossas}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- <version>${version.jboss.jbossas}</version>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>javassist</artifactId>
<version>${version.javassist}</version>
More information about the jboss-cvs-commits
mailing list