[jboss-cvs] JBossAS SVN: r88873 - in projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide: aopDevelopment/aspects/src/main/resources/META-INF and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 14 10:58:36 EDT 2009
Author: kabir.khan at jboss.com
Date: 2009-05-14 10:58:36 -0400 (Thu, 14 May 2009)
New Revision: 88873
Modified:
projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/aopDevelopment/aspects/src/main/resources/META-INF/jboss-beans.xml
projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/aopDevelopment/pom.xml
projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/gettingStarted/humanResourcesService/pom.xml
projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/gettingStarted/pom.xml
Log:
[JBMICROCONT-432] versions as properties and fix aop example
Modified: projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/aopDevelopment/aspects/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/aopDevelopment/aspects/src/main/resources/META-INF/jboss-beans.xml 2009-05-14 14:43:43 UTC (rev 88872)
+++ projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/aopDevelopment/aspects/src/main/resources/META-INF/jboss-beans.xml 2009-05-14 14:58:36 UTC (rev 88873)
@@ -9,39 +9,26 @@
</bean>
<!-- Define the jndi binding advice -->
- <beanfactory name="JndiAdvice" class="org.jboss.aop.microcontainer.aspects.jndi.JndiIntroduction">
- <property name="env">
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" name="JndiAspect" class="org.jboss.aop.microcontainer.aspects.jndi.JndiIntroduction">
+ <property name="env">
<map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
<entry>
<key>java.naming.factory.initial</key>
<value>org.jboss.example.microcontainer.aspects.EnvInitialContextFactory</value>
</entry>
</map>
- </property>
- </beanfactory>
+ </property>
+ </interceptor>
- <bean name="JndiAspect" class="org.jboss.aop.microcontainer.beans.Aspect">
- <property name="advice"><inject bean="JndiAdvice"/></property>
- <property name="manager"><inject bean="AspectManager"/></property>
- </bean>
-
<!-- Introduce the KernelControllerContextAware interface to the JndiBinding annotation -->
- <bean name="JndiIntroduction" class="org.jboss.aop.microcontainer.beans.IntroductionBinding">
- <property name="classes">@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding</property>
- <property name="interfaces">
- <list elementClass="java.lang.String">
- <value>org.jboss.kernel.spi.dependency.KernelControllerContextAware</value>
- </list>
- </property>
- <property name="manager"><inject bean="AspectManager"/></property>
- </bean>
+ <introduction xmlns="urn:jboss:aop-beans:1.0" class="@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding">
+ <interfaces>org.jboss.kernel.spi.dependency.KernelControllerContextAware</interfaces>
+ </introduction>
<!-- Apply the jndi binding to all KernelControllerContextAware interface callbacks -->
- <bean name="JndiBinding" class="org.jboss.aop.microcontainer.beans.AspectBinding">
- <property name="pointcut">execution(* $instanceof{org.jboss.kernel.spi.dependency.KernelControllerContextAware}->$implements{org.jboss.kernel.spi.dependency.KernelControllerContextAware}(..))</property>
- <property name="aspect"><inject bean="JndiAspect" property="definition"/></property>
- <property name="manager"><inject bean="AspectManager"/></property>
- </bean>
+ <bind xmlns="urn:jboss:aop-beans:1.0" name="JndiBinding" pointcut="execution(* $instanceof{org.jboss.kernel.spi.dependency.KernelControllerContextAware}->$implements{org.jboss.kernel.spi.dependency.KernelControllerContextAware}(..))">
+ <interceptor-ref name="JndiAspect"/>
+ </bind>
<bean name="Bean" class="org.jboss.example.microcontainer.aspects.SimpleBean">
<annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="beans/SimpleBean", aliases={"beans/XmlAnnotatedSimpleBean"})</annotation>
Modified: projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/aopDevelopment/pom.xml
===================================================================
--- projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/aopDevelopment/pom.xml 2009-05-14 14:43:43 UTC (rev 88872)
+++ projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/aopDevelopment/pom.xml 2009-05-14 14:58:36 UTC (rev 88873)
@@ -18,17 +18,17 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.0.Beta6</version>
+ <version>${mc.release}</version>
</dependency>
<dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
- <version>2.0.0.beta1</version>
+ <version>${aop.release}</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
- <version>2.0.0.Beta6</version>
+ <version>${mc.release}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -125,5 +125,7 @@
<properties>
<parent.relative.dir>.</parent.relative.dir>
+ <mc.release>2.0.6.GA</mc.release>
+ <aop.release>2.1.1.GA</aop.release>
</properties>
</project>
Modified: projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/gettingStarted/humanResourcesService/pom.xml
===================================================================
--- projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/gettingStarted/humanResourcesService/pom.xml 2009-05-14 14:43:43 UTC (rev 88872)
+++ projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/gettingStarted/humanResourcesService/pom.xml 2009-05-14 14:58:36 UTC (rev 88873)
@@ -22,8 +22,14 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/gettingStarted/pom.xml
===================================================================
--- projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/gettingStarted/pom.xml 2009-05-14 14:43:43 UTC (rev 88872)
+++ projects/microcontainer/branches/Branch_2_0/docs/examples/User_Guide/gettingStarted/pom.xml 2009-05-14 14:58:36 UTC (rev 88873)
@@ -22,80 +22,87 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${release}</version>
+ <version>${mc.release}</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client-spi</artifactId>
- <version>${release}</version>
+ <version>${mc.release}</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client</artifactId>
- <version>${release}</version>
+ <version>${mc.release}</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core-spi</artifactId>
- <version>${release}</version>
+ <version>${mc.release}</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core</artifactId>
- <version>${release}</version>
+ <version>${mc.release}</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-impl</artifactId>
- <version>${release}</version>
+ <version>${mc.release}</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-spi</artifactId>
- <version>${release}</version>
+ <version>${mc.release}</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-structure-spi</artifactId>
- <version>${release}</version>
+ <version>${mc.release}</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>${release}</version>
+ <version>${mc.release}</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
- <version>${release}</version>
+ <version>${mc.release}</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-managed</artifactId>
- <version>${release}</version>
+ <version>${mc.release}</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-metatype</artifactId>
- <version>${release}</version>
+ <version>${mc.release}</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
- <version>2.0.0.Beta6</version>
+ <version>${vfs.release}</version>
</dependency>
<dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
- <version>2.0.0.beta1</version>
+ <version>${aop.release}</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
- <version>${release}</version>
+ <version>${mc.release}</version>
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>${test.release}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -121,7 +128,10 @@
</build>
<properties>
- <release>2.0.0.Beta9</release>
+ <mc.release>2.0.6.GA</mc.release>
+ <vfs.release>2.1.2.GA</vfs.release>
+ <aop.release>2.1.1.GA</aop.release>
+ <test.release>1.1.4.GA</test.release>
</properties>
</project>
More information about the jboss-cvs-commits
mailing list