Author: rr
Date: Tue Jul 28 17:59:23 2009
New Revision: 798622
URL: http://svn.apache.org/viewvc?rev=798622&view=rev
Log:
ODE-499: Fix for HelloWorldJbiTest - it needs jndi bean definition
Modified:
ode/branches/APACHE_ODE_1.X/Rakefile
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/smx.xml
Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=798622&r1=798621&r2=798622&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Tue Jul 28 17:59:23 2009
@@ -531,6 +531,7 @@
test.setup task(:prepare_jbi_tests) do |task|
cp _("src/main/jbi/ode-jbi.properties"), _("target/test/smx/ode")
cp _("src/main/jbi/hibernate.properties"), _("target/test/smx/ode")
+ rm_rf Dir["target/test/resources"]
cp_r _("src/test/resources"), _("target/test/resources")
end
end
Modified:
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/smx.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/smx.xml?rev=798622&r1=798621&r2=798622&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/smx.xml
(original)
+++
ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldJbiTest/smx.xml
Tue Jul 28 17:59:23 2009
@@ -18,36 +18,49 @@
-->
<beans xmlns:sm="http://servicemix.apache.org/config/1.0";
- xmlns:http="http://servicemix.apache.org/http/1.0";
- xmlns:eip="http://servicemix.apache.org/eip/1.0";
- xmlns:hello="urn:/HelloWorld2.wsdl"
- >
+ xmlns:http="http://servicemix.apache.org/http/1.0";
+ xmlns:eip="http://servicemix.apache.org/eip/1.0";
+ xmlns:hello="urn:/HelloWorld2.wsdl"
+ xmlns:util="http://www.springframework.org/schema/util";
+ >
- <bean id="transactionManager"
class="org.apache.geronimo.transaction.manager.GeronimoTransactionManager"/>
-
- <sm:container
- id="jbi"
- embedded="true"
- rootDir="target/test/smx"
- transactionManager="#transactionManager"
- >
- <sm:activationSpecs>
- <sm:activationSpec id="hello-http">
- <sm:component>
- <http:component>
- <http:endpoints>
- <http:endpoint
-
service="hello:HelloService"
- endpoint="http"
-
defaultOperation="Hello"
- role="consumer"
-
locationURI="http://localhost:8192/HelloHttp/";
-
defaultMep="http://www.w3.org/2004/08/wsdl/in-out";
- soap="true" />
- </http:endpoints>
- </http:component>
- </sm:component>
- </sm:activationSpec>
- </sm:activationSpecs>
- </sm:container>
+ <bean id="transactionManager"
class="org.apache.geronimo.transaction.manager.GeronimoTransactionManager"/>
+
+ <bean id="jndi"
+ class="org.apache.xbean.spring.jndi.SpringInitialContextFactory"
+ factory-method="makeInitialContext"
+ singleton="true"
+ >
+ <property name="entries" ref="jndiEntries" />
+ </bean>
+
+ <util:map id="jndiEntries">
+ </util:map>
+
+ <sm:container
+ id="jbi"
+ embedded="true"
+ rootDir="target/test/smx"
+ transactionManager="#transactionManager"
+ depends-on="jndi"
+ >
+ <sm:activationSpecs>
+ <sm:activationSpec id="hello-http">
+ <sm:component>
+ <http:component>
+ <http:endpoints>
+ <http:endpoint
+ service="hello:HelloService"
+ endpoint="http"
+ defaultOperation="Hello"
+ role="consumer"
+ locationURI="http://localhost:8192/HelloHttp/";
+
defaultMep="http://www.w3.org/2004/08/wsdl/in-out";
+ soap="true" />
+ </http:endpoints>
+ </http:component>
+ </sm:component>
+ </sm:activationSpec>
+ </sm:activationSpecs>
+ </sm:container>
</beans>
