| Commit in servicemix/base/src/main/release/examples/bpel on MAIN | |||
| build.xml | +1 | 1.1 -> 1.2 | |
| servicemix.xml | +21 | -4 | 1.3 -> 1.4 |
| carol.properties | -1 | 1.1 removed | |
| jndi.properties | -1 | 1.1 removed | |
| jndi.xml | -23 | 1.1 removed | |
| +22 | -29 | ||
zapped some unnecessary cruft - the JNDI is now configured in the servicemix.xml file
servicemix/base/src/main/release/examples/bpel
diff -u -r1.1 -r1.2 --- build.xml 1 Aug 2005 07:13:29 -0000 1.1 +++ build.xml 5 Aug 2005 09:54:07 -0000 1.2 @@ -13,6 +13,7 @@
<path id="javac.classpath">
<pathelement path="${class.dir}"/>
+ <pathelement path="../../conf"/>
<fileset dir="../../lib">
<include name="**/*.jar"/>
</fileset>
servicemix/base/src/main/release/examples/bpel
diff -u -r1.3 -r1.4 --- servicemix.xml 3 Aug 2005 05:51:02 -0000 1.3 +++ servicemix.xml 5 Aug 2005 09:54:07 -0000 1.4 @@ -13,10 +13,9 @@
<components>
-
<!-- Subscribe to a JMS destination -->
- <component id="ProcessPORT" service="pxe:JmService" class="org.servicemix.components.jms.JmsServiceComponent" - destinationService="pxe:ProcessSVC" destinationEndpoint="ProcessSVC" destinationOperation="Run">
+ <component id="myComponent" service="pxe:JmService" class="org.servicemix.components.jms.JmsServiceComponent" + destinationService="pxe:ProcessSVC" destinationEndpoint="ProcessPORT" destinationOperation="Run">
<property name="template">
<bean class="org.springframework.jms.core.JmsTemplate">
<property name="connectionFactory">
@@ -30,7 +29,25 @@
</components> </container>
-
+ + <!-- JNDI configurration --> + <bean id="jndi" class="org.servicemix.jbi.jndi.SpringInitialContextFactory" factory-method="makeInitialContext" singleton="true"> + <property name="entries"> + <map> + <entry key="jdbc/pxe__pm"> + <bean class="org.hsqldb.jdbc.jdbcDataSource"> + <property name="database" value="jdbc:hsqldb:mem:pxe"/> + <property name="user" value = "sa"/> + <property name="password" value = ""/> + </bean> + </entry> + + <entry key="javax.transaction.TransactionManager"> + <bean class="org.springframework.transaction.jta.JotmFactoryBean"/> + </entry> + </map> + </property> + </bean>
<!-- message broker --> <bean id="broker" class="org.activemq.spring.BrokerFactoryBean">
servicemix/base/src/main/release/examples/bpel
carol.properties removed after 1.1
diff -N carol.properties --- carol.properties 1 Aug 2005 07:13:29 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1 +0,0 @@
-carol.start.jndi=false
\ No newline at end of file
servicemix/base/src/main/release/examples/bpel
jndi.properties removed after 1.1
diff -N jndi.properties --- jndi.properties 1 Aug 2005 07:13:29 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1 +0,0 @@
-java.naming.factory.initial = org.servicemix.jbi.jndi.SpringInitialContextFactory
servicemix/base/src/main/release/examples/bpel
jndi.xml removed after 1.1
diff -N jndi.xml --- jndi.xml 1 Aug 2005 07:13:29 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> -<!-- START SNIPPET: jndi --> -<beans> - <bean id="jndi" class="org.servicemix.jbi.jndi.DefaultContext" singleton="true"> - <property name="entries"> - <map> - <entry key="jdbc/pxe__pm"> - <bean class="org.hsqldb.jdbc.jdbcDataSource"> - <property name="database" value="jdbc:hsqldb:mem:pxe"/> - <property name="user" value = "sa"/> - <property name="password" value = ""/> - </bean> - </entry> - - <entry key="javax.transaction.TransactionManager"> - <bean class="org.springframework.transaction.jta.JotmFactoryBean"/> - </entry> - </map> - </property> - </bean> -</beans> -<!-- END SNIPPET: jndi -->
