[jboss-cvs] JBossAS SVN: r88871 - in projects/microcontainer/trunk/docs/examples/User_Guide/aopDevelopment: aspects/src/main/resources/META-INF and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2009-05-14 10:40:10 -0400 (Thu, 14 May 2009)
New Revision: 88871

Modified:
   projects/microcontainer/trunk/docs/examples/User_Guide/aopDevelopment/aspects/src/main/resources/META-INF/jboss-beans.xml
   projects/microcontainer/trunk/docs/examples/User_Guide/aopDevelopment/pom.xml
Log:
[JBMICROCONT-432] Undo commit to tag

Modified: projects/microcontainer/trunk/docs/examples/User_Guide/aopDevelopment/aspects/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/aopDevelopment/aspects/src/main/resources/META-INF/jboss-beans.xml	2009-05-14 14:37:09 UTC (rev 88870)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/aopDevelopment/aspects/src/main/resources/META-INF/jboss-beans.xml	2009-05-14 14:40:10 UTC (rev 88871)
@@ -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/trunk/docs/examples/User_Guide/aopDevelopment/pom.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/aopDevelopment/pom.xml	2009-05-14 14:37:09 UTC (rev 88870)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/aopDevelopment/pom.xml	2009-05-14 14:40:10 UTC (rev 88871)
@@ -18,17 +18,17 @@
       <dependency>
         <groupId>org.jboss.microcontainer</groupId>
         <artifactId>jboss-kernel</artifactId>
-        <version>2.0.0.Beta6</version>
+        <version>2.2.0-SNAPSHOT</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>2.2.0-SNAPSHOT</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>