[jboss-cvs] JBossAS SVN: r70582 - in projects/microcontainer/trunk: aop-mc-int/src/main/org/jboss/aop/microcontainer/integration and 1 other directories.

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

Author: adrian at jboss.org
Date: 2008-03-09 09:01:48 -0400 (Sun, 09 Mar 2008)
New Revision: 70582

Modified:
   projects/microcontainer/trunk/aop-mc-int/.classpath
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AspectDependencyBuilderListItem.java
   projects/microcontainer/trunk/reliance-rules/src/resources/tests/org/jboss/test/reliance/drools/test/ConceptTestCase.xml
Log:
Revert to schema binding initializer for aop-mc-int and fix an NPE

Modified: projects/microcontainer/trunk/aop-mc-int/.classpath
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/.classpath	2008-03-09 12:45:23 UTC (rev 70581)
+++ projects/microcontainer/trunk/aop-mc-int/.classpath	2008-03-09 13:01:48 UTC (rev 70582)
@@ -9,5 +9,6 @@
 	<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar" sourcepath="/M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3-sources.jar"/>
 	<classpathentry exported="true" kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
 	<classpathentry exported="true" kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
+	<classpathentry exported="true" kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AspectDependencyBuilderListItem.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AspectDependencyBuilderListItem.java	2008-03-09 12:45:23 UTC (rev 70581)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AspectDependencyBuilderListItem.java	2008-03-09 13:01:48 UTC (rev 70582)
@@ -70,7 +70,8 @@
          {
             try
             {
-               if (item.getIDependOn().equals(dependencyName))
+               Object iDependOn = item.getIDependOn();
+               if (iDependOn != null && iDependOn.equals(dependencyName))
                {
                   depends.removeIDependOn(item);
                }

Modified: projects/microcontainer/trunk/reliance-rules/src/resources/tests/org/jboss/test/reliance/drools/test/ConceptTestCase.xml
===================================================================
--- projects/microcontainer/trunk/reliance-rules/src/resources/tests/org/jboss/test/reliance/drools/test/ConceptTestCase.xml	2008-03-09 12:45:23 UTC (rev 70581)
+++ projects/microcontainer/trunk/reliance-rules/src/resources/tests/org/jboss/test/reliance/drools/test/ConceptTestCase.xml	2008-03-09 13:01:48 UTC (rev 70582)
@@ -36,7 +36,7 @@
    <interceptor xmlns="urn:jboss:aop-beans:1.0"
                name="FireAllRulesAfterInvocationAdvice"
                class="org.jboss.reliance.drools.core.aspects.FireAllRulesAfterInvocationInterceptor">
-      <constructor>
+      <constructor xmlns="urn:jboss:bean-deployer:2.0">
          <parameter><inject bean="WorkingMemory" property="statefulSession"/></parameter>
       </constructor>
    </interceptor>
@@ -48,7 +48,7 @@
                name="RulesMapper"
                class="org.jboss.reliance.drools.dependency.RuleDependencyMapper"
                classes="@org.jboss.reliance.drools.dependency.RulesAware">
-      <property name="factory"><inject bean="RuleBasedDependencyFactory"/></property>
+      <property name="factory" xmlns="urn:jboss:bean-deployer:2.0"><inject bean="RuleBasedDependencyFactory"/></property>
    </lifecycle-describe>
 
    <bean name="RuleBasedDependencyFactory" class="org.jboss.reliance.drools.dependency.RuleBasedDependencyItemFactory">