svn commit: r1747581 - in /aries/trunk/blueprint: blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/ blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/

[gnodet]

Author: gnodet
Date: Thu Jun  9 19:03:20 2016
New Revision: 1747581

URL: http://svn.apache.org/viewvc?rev=1747581&view=rev
Log:
[ARIES-1567] Error when using Blueprint Spring with simple configuration

Modified:
    
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringTest.java
    
aries/trunk/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/SpringApplicationContext.java
    
aries/trunk/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/config.xml

Modified: 
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringTest.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringTest.java?rev=1747581&r1=1747580&r2=1747581&view=diff
==============================================================================
--- 
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringTest.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringTest.java
 Thu Jun  9 19:03:20 2016
@@ -32,6 +32,7 @@ import static org.apache.aries.blueprint
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 
 public class SpringTest extends AbstractBlueprintIntegrationTest {
 
@@ -72,6 +73,8 @@ public class SpringTest extends Abstract
             mvnBundle("org.apache.servicemix.bundles", 
"org.apache.servicemix.bundles.spring-aop"),
             mvnBundle("org.apache.servicemix.bundles", 
"org.apache.servicemix.bundles.spring-expression"),
             mvnBundle("org.apache.servicemix.bundles", 
"org.apache.servicemix.bundles.spring-tx"),
+            // Axon namespace handler for testing
+            mavenBundle("org.axonframework", "axon-core", "2.4.4"),
             // test bundle
             mvnBundle("org.apache.aries.blueprint", 
"org.apache.aries.blueprint.testbundles", false),
         };

Modified: 
aries/trunk/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/SpringApplicationContext.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/SpringApplicationContext.java?rev=1747581&r1=1747580&r2=1747581&view=diff
==============================================================================
--- 
aries/trunk/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/SpringApplicationContext.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/SpringApplicationContext.java
 Thu Jun  9 19:03:20 2016
@@ -50,6 +50,7 @@ public class SpringApplicationContext ex
             }
         });
         prepareBeanFactory(beanFactory);
+        prepareRefresh();
     }
 
     public void process() {

Modified: 
aries/trunk/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/config.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/config.xml?rev=1747581&r1=1747580&r2=1747581&view=diff
==============================================================================
--- 
aries/trunk/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/config.xml
 (original)
+++ 
aries/trunk/blueprint/blueprint-testbundles/src/main/resources/OSGI-INF/blueprint/config.xml
 Thu Jun  9 19:03:20 2016
@@ -21,15 +21,19 @@
            xmlns:bean="http://www.springframework.org/schema/beans";
            xmlns:util="http://www.springframework.org/schema/util";
            xmlns:context="http://www.springframework.org/schema/context";
+           xmlns:axon="http://www.axonframework.org/schema/core";
            xsi:schemaLocation="
              http://www.osgi.org/xmlns/blueprint/v1.0.0 
http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
              http://www.springframework.org/schema/util 
http://www.springframework.org/schema/util/spring-util-4.2.xsd
              http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context-4.2.xsd
              http://www.springframework.org/schema/tx 
http://www.springframework.org/schema/tx/spring-tx-4.2.xsd
-             http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.2.xsd";>
+             http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+             http://www.axonframework.org/schema/core 
http://www.axonframework.org/schema/axon-core.xsd";>
 
     <annotation-driven xmlns="http://www.springframework.org/schema/tx"/>
 
+    <axon:annotation-config/>
+
     <bean:import resource="spring/imported.xml" />
 
     <bean:beans default-autowire="constructor">