[jboss-cvs] JBossAS SVN: r80177 - in projects/demos/microcontainer/trunk: ioc/src/main/java/org/jboss/demos/ioc/annotations and 1 other directories.

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

Author: alesj
Date: 2008-10-29 06:57:12 -0400 (Wed, 29 Oct 2008)
New Revision: 80177

Modified:
   projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/SimpleExecutor.java
   projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/annotations-beans.xml
   projects/demos/microcontainer/trunk/pom.xml
Log:
Currently use MC 2.2.0-SNAPSHOT - includes AOP fix.
Enable interceptor as it now works. :-)

Modified: projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/SimpleExecutor.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/SimpleExecutor.java	2008-10-29 10:09:59 UTC (rev 80176)
+++ projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/SimpleExecutor.java	2008-10-29 10:57:12 UTC (rev 80177)
@@ -28,9 +28,10 @@
  */
 public class SimpleExecutor implements Executor
 {
+   private static Random random = new Random();
+
    public void execute() throws Exception
    {
-      Random random = new Random();
       Thread.sleep(Math.abs(random.nextLong() % 101));
    }
 }
\ No newline at end of file

Modified: projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/annotations-beans.xml
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/annotations-beans.xml	2008-10-29 10:09:59 UTC (rev 80176)
+++ projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/annotations-beans.xml	2008-10-29 10:57:12 UTC (rev 80177)
@@ -1,12 +1,10 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-<!--
   <interceptor xmlns="urn:jboss:aop-beans:1.0" name="StopWatchInterceptor" class="org.jboss.demos.ioc.annotations.StopWatchInterceptor"/>
   
   <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.demos.ioc.annotations.StopWatchLog->*(..)) OR execution(* *->@org.jboss.demos.ioc.annotations.StopWatchLog(..))">
      <interceptor-ref name="StopWatchInterceptor"/>
   </bind>
--->
 
   <bean name="AnnotatedExecutor" class="org.jboss.demos.ioc.annotations.AnnotatedExecutor">
     <constructor>

Modified: projects/demos/microcontainer/trunk/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/pom.xml	2008-10-29 10:09:59 UTC (rev 80176)
+++ projects/demos/microcontainer/trunk/pom.xml	2008-10-29 10:57:12 UTC (rev 80177)
@@ -35,7 +35,7 @@
     <version.jboss.jbossas>5.0.0.CR2</version.jboss.jbossas>
     <version.jboss.man>2.0.0.CR2</version.jboss.man>
     <version.jboss.mdr>2.0.0.GA</version.jboss.mdr>
-    <version.jboss.microcontainer>2.0.0.CR3</version.jboss.microcontainer>
+    <version.jboss.microcontainer>2.2.0-SNAPSHOT</version.jboss.microcontainer>
     <version.jboss.deployers>2.0.0.CR3</version.jboss.deployers>
     <version.jboss.classloader>2.0.0.CR4</version.jboss.classloader>
     <version.jboss.common.core>2.2.8.GA</version.jboss.common.core>