You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/01/05 02:32:38 UTC

svn commit: r492842 - in /incubator/servicemix/trunk: ./ distributions/apache-servicemix/src/main/release/examples/ distributions/apache-servicemix/src/main/release/examples/cluster/ samples/basic/ samples/basic/src/main/resources/ samples/bridge/ samp...

Author: gnodet
Date: Thu Jan  4 17:32:37 2007
New Revision: 492842

URL: http://svn.apache.org/viewvc?view=rev&rev=492842
Log:
Fix examples and distributions

Added:
    incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/jmx.xml   (with props)
Modified:
    incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/README.txt
    incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/cluster/README.txt
    incubator/servicemix/trunk/pom.xml
    incubator/servicemix/trunk/samples/basic/README.txt
    incubator/servicemix/trunk/samples/basic/pom.xml
    incubator/servicemix/trunk/samples/basic/src/main/resources/servicemix.xml
    incubator/servicemix/trunk/samples/bridge/README.txt
    incubator/servicemix/trunk/samples/bridge/bridge-xslt-su/src/main/resources/xbean.xml
    incubator/servicemix/trunk/samples/loan-broker/README.txt
    incubator/servicemix/trunk/samples/servicemix-web/README.txt
    incubator/servicemix/trunk/samples/servicemix-web/pom.xml
    incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/activemq.xml
    incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/applicationContext.xml
    incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/web.xml
    incubator/servicemix/trunk/tooling/jbi-maven-plugin/pom.xml

Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/README.txt?view=diff&rev=492842&r1=492841&r2=492842
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/README.txt (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/README.txt Thu Jan  4 17:32:37 2007
@@ -1,22 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 Welcome to the ServiceMix Examples
 ==================================
@@ -24,4 +21,4 @@
 This distribution contains several examples that are a good
 starting point.  You will find more informations on the
 user guide:
-  http://incubator.apache.org/servicemix/sm30ug/
+  http://incubator.apache.org/servicemix/users-guide.html

Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/cluster/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/cluster/README.txt?view=diff&rev=492842&r1=492841&r2=492842
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/cluster/README.txt (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/cluster/README.txt Thu Jan  4 17:32:37 2007
@@ -22,17 +22,17 @@
 
 Before starting this example, run
 
-ant setup
+  ant setup
 
 To start the servicemix servers using the sample configurations, just run:
 
-cd poller
-../../../bin/servicemix servicemix-poller.xml
+  cd poller
+  ../../../bin/servicemix servicemix-poller.xml
 
 and
 
-cd writer
-../../../bin/servicemix servicemix-writer.xml
+  cd writer
+  ../../../bin/servicemix servicemix-writer.xml
 
 This will start two ServiceMix containers.
 

Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?view=diff&rev=492842&r1=492841&r2=492842
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Thu Jan  4 17:32:37 2007
@@ -228,6 +228,7 @@
                 <module>core</module>
                 <module>common</module>
                 <module>tooling</module>
+                <module>archetypes</module>
                 <module>deployables</module>
                 <module>servicemix-itests</module>
                 <module>samples</module>
@@ -260,6 +261,7 @@
                 </property>
             </activation>
             <modules>
+                <module>archetypes</module>
                 <module>deployables</module>
                 <module>servicemix-itests</module>
                 <module>samples</module>

Modified: incubator/servicemix/trunk/samples/basic/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/basic/README.txt?view=diff&rev=492842&r1=492841&r2=492842
==============================================================================
--- incubator/servicemix/trunk/samples/basic/README.txt (original)
+++ incubator/servicemix/trunk/samples/basic/README.txt Thu Jan  4 17:32:37 2007
@@ -24,5 +24,5 @@
   mvn jbi:embeddedServicemix
 
 For more information on running this example please see:
-  http://incubator.apache.org/servicemix/sm30ug/basic.html
+  http://incubator.apache.org/servicemix/basic.html
 

Modified: incubator/servicemix/trunk/samples/basic/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/basic/pom.xml?view=diff&rev=492842&r1=492841&r2=492842
==============================================================================
--- incubator/servicemix/trunk/samples/basic/pom.xml (original)
+++ incubator/servicemix/trunk/samples/basic/pom.xml Thu Jan  4 17:32:37 2007
@@ -108,9 +108,9 @@
             <version>${spring-version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-dao</artifactId>
-            <version>${spring-version}</version>
+            <groupId>org.jencks</groupId>
+            <artifactId>jencks-amqpool</artifactId>
+            <version>${jencks-version}</version>
         </dependency>
     </dependencies>
 

Modified: incubator/servicemix/trunk/samples/basic/src/main/resources/servicemix.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/basic/src/main/resources/servicemix.xml?view=diff&rev=492842&r1=492841&r2=492842
==============================================================================
--- incubator/servicemix/trunk/samples/basic/src/main/resources/servicemix.xml (original)
+++ incubator/servicemix/trunk/samples/basic/src/main/resources/servicemix.xml Thu Jan  4 17:32:37 2007
@@ -21,8 +21,10 @@
 	     xmlns:sm="http://servicemix.apache.org/config/1.0"
 	     xmlns:jms="http://servicemix.apache.org/jms/1.0"
 	     xmlns:amq="http://activemq.org/config/1.0"
-	     xmlns:my="http://servicemix.apache.org/demo/"
-       xmlns:jencks="http://jencks.org/2.0">
+	     xmlns:amqra="http://activemq.org/ra/1.0"
+	     xmlns:amqpool="http://jencks.org/amqpool/2.0"
+       xmlns:jencks="http://jencks.org/2.0"
+	     xmlns:my="http://servicemix.apache.org/demo/">
 
 
 	<!-- the JBI container -->
@@ -30,8 +32,6 @@
                 rootDir="./target/data/smx" 
                 useMBeanServer="true"
 		            createMBeanServer="true" 
-                dumpStats="true"
-		            statsInterval="10" 
                 transactionManager="#transactionManager" 
                 flowName="seda"
                 autoEnlistInTransaction="true">
@@ -105,14 +105,12 @@
                             processorName="jca"
                             bootstrapContext="#bootstrapContext"
                             resourceAdapter="#activeMQResourceAdapter"
-                            connectionFactory="#managedJmsFactory"
+                            connectionFactory="#jmsFactory"
                             defaultMep="http://www.w3.org/2004/08/wsdl/in-only"
                             synchronous="true">
                 <jms:activationSpec>
-    							<bean class="org.apache.activemq.ra.ActiveMQActivationSpec">
-    								<property name="destination" value="servicemix.source" />
-    								<property name="destinationType" value="javax.jms.Topic" />
-    							</bean>
+    							<amqra:activationSpec destination="servicemix.source"
+                                        destinationType="javax.jms.Topic" />
                 </jms:activationSpec>
               </jms:endpoint>
             </jms:endpoints>
@@ -132,7 +130,7 @@
                             endpoint="endpoint"
                             role="provider"
                             processorName="jca"
-                            connectionFactory="#managedJmsFactory"
+                            connectionFactory="#jmsFactory"
                             jmsProviderDestinationName="servicemix.result"
                             destinationStyle="topic" />
             </jms:endpoints>
@@ -158,14 +156,12 @@
                             targetService="my:trace"
                             bootstrapContext="#bootstrapContext"
                             resourceAdapter="#activeMQResourceAdapter"
-                            connectionFactory="#managedJmsFactory"
+                            connectionFactory="#jmsFactory"
                             defaultMep="http://www.w3.org/2004/08/wsdl/in-only"
                             synchronous="true">
                 <jms:activationSpec>
-    							<bean class="org.apache.activemq.ra.ActiveMQActivationSpec">
-    								<property name="destination" value="servicemix.result" />
-    								<property name="destinationType" value="javax.jms.Topic" />
-    							</bean>
+    							<amqra:activationSpec destination="servicemix.result"
+    								                    destinationType="javax.jms.Topic" />
                 </jms:activationSpec>
               </jms:endpoint>
             </jms:endpoints>
@@ -184,16 +180,23 @@
 		</sm:activationSpecs>
 	</sm:container>
 
+  <!-- Transaction Manager -->
+	<jencks:transactionManager id="transactionManager" />
 
-	<!-- the JCA container -->
-	<bean id="bootstrapContext" class="org.jencks.factory.BootstrapContextFactoryBean">
-		<property name="threadPoolSize" value="25" />
-	</bean>
+  <!-- Work manager -->
+  <jencks:workManager
+            id="workManager"
+            threadPoolSize="25"
+            transactionManager="#transactionManager" />
+  
+  <!-- Bootstrap context for JCA -->
+  <jencks:bootstrapContext
+            id="bootstrapContext"
+            workManager="#workManager"
+            transactionManager="#transactionManager" />
 
 	<!-- the JCA Resource Adapter -->
-	<bean id="activeMQResourceAdapter" class="org.apache.activemq.ra.ActiveMQResourceAdapter" singleton="true">
-		<property name="serverUrl" value="tcp://localhost:61616" />
-	</bean>
+	<amqra:resourceAdapter id="activeMQResourceAdapter" serverUrl="tcp://localhost:61616" />
 
 	<!-- message broker -->
 	<amq:broker id="broker" persistent="false">
@@ -201,28 +204,13 @@
 			<amq:transportConnector uri="tcp://localhost:61616" />
 		</amq:transportConnectors>
 	</amq:broker>
+	
+	<!-- JMS Xa-enabled pooled factory -->
+	<amqpool:jcaPooledConnectionFactory 
+          name="jmsFactory"
+          transactionManager="#transactionManager"
+          maxConnections="10"
+          brokerURL="tcp://localhost:61616"
+          depends-on="broker" />
 
-	<jencks:transactionManager id="transactionManager" />
-
-	<bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory" depends-on="broker">
-		<property name="connectionFactory">
-			<bean class="org.apache.activemq.ActiveMQConnectionFactory">
-				<property name="brokerURL" value="tcp://localhost:61616" />
-			</bean>
-		</property>
-	</bean>
-
-  <!-- A managed JMS ConnectionFactory for ActiveMQ -->
-  <bean id="activemqMCF" class="org.apache.activemq.ra.ActiveMQManagedConnectionFactory">
-    <property name="resourceAdapter">
-      <bean class="org.apache.activemq.ra.ActiveMQResourceAdapter">
-        <property name="serverUrl" value="tcp://localhost:61616"/>
-      </bean>
-    </property>
-  </bean>
-  <bean id="managedJmsFactory" class="org.springframework.jca.support.LocalConnectionFactoryBean">
-    <property name="managedConnectionFactory" ref="activemqMCF"/>
-    <property name="connectionManager" ref="connectionManager"/>
-  </bean>
-  <bean id="connectionManager" class="org.jencks.factory.ConnectionManagerFactoryBean" />
 </beans>

Modified: incubator/servicemix/trunk/samples/bridge/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/bridge/README.txt?view=diff&rev=492842&r1=492841&r2=492842
==============================================================================
--- incubator/servicemix/trunk/samples/bridge/README.txt (original)
+++ incubator/servicemix/trunk/samples/bridge/README.txt Thu Jan  4 17:32:37 2007
@@ -26,10 +26,12 @@
 in the root dir of this ditribution.
 
 To start this sample, run:
-  mvn install
-  cd bridge-sa
-  mvn jbi:projectDeploy
+  mvn install jbi:projectDeploy
+  
+You can then launch the client.html in your favorite browser
+and send an HTTP request which will be transformed in a JMS
+message.
 
 For more information on running this example please see:
-  http://incubator.apache.org/servicemix/sm30ug/bridge.html
+  http://incubator.apache.org/servicemix/bridge.html
 

Modified: incubator/servicemix/trunk/samples/bridge/bridge-xslt-su/src/main/resources/xbean.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/bridge/bridge-xslt-su/src/main/resources/xbean.xml?view=diff&rev=492842&r1=492841&r2=492842
==============================================================================
--- incubator/servicemix/trunk/samples/bridge/bridge-xslt-su/src/main/resources/xbean.xml (original)
+++ incubator/servicemix/trunk/samples/bridge/bridge-xslt-su/src/main/resources/xbean.xml Thu Jan  4 17:32:37 2007
@@ -20,10 +20,6 @@
 <beans xmlns:saxon="http://servicemix.apache.org/saxon/1.0"
        xmlns:b="http://servicemix.apache.org/samples/bridge">
 
-  <classpath>
-    <location>.</location>
-  </classpath>
-
   <saxon:xslt service="b:xslt" endpoint="endpoint"
               result="string"
               resource="classpath:bridge.xslt" />

Modified: incubator/servicemix/trunk/samples/loan-broker/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/loan-broker/README.txt?view=diff&rev=492842&r1=492841&r2=492842
==============================================================================
--- incubator/servicemix/trunk/samples/loan-broker/README.txt (original)
+++ incubator/servicemix/trunk/samples/loan-broker/README.txt Thu Jan  4 17:32:37 2007
@@ -28,9 +28,7 @@
 in the root dir of this ditribution.
 
 To run this sample, launch the following commands:
-  mvn install
-  cd loan-broker-sa
-  mvn jbi:projectDeploy
+  mvn install jbi:projectDeploy
 
 For more information on this example please see
-  http://incubator.apache.org/servicemix/sm30ug/loan-broker-bpel.html
+  http://incubator.apache.org/servicemix/loan-broker-bpel.html

Modified: incubator/servicemix/trunk/samples/servicemix-web/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/servicemix-web/README.txt?view=diff&rev=492842&r1=492841&r2=492842
==============================================================================
--- incubator/servicemix/trunk/samples/servicemix-web/README.txt (original)
+++ incubator/servicemix/trunk/samples/servicemix-web/README.txt Thu Jan  4 17:32:37 2007
@@ -25,3 +25,6 @@
    http://localhost:8080/servicemix-web
 and
    http://localhost:8080/servicemix-web/examples/
+
+See http://incubator.apache.org/servicemix/servicemix-web.html for more 
+informations.

Modified: incubator/servicemix/trunk/samples/servicemix-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/servicemix-web/pom.xml?view=diff&rev=492842&r1=492841&r2=492842
==============================================================================
--- incubator/servicemix/trunk/samples/servicemix-web/pom.xml (original)
+++ incubator/servicemix/trunk/samples/servicemix-web/pom.xml Thu Jan  4 17:32:37 2007
@@ -113,7 +113,13 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <artifactId>spring-web</artifactId>
+      <version>${spring-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jms</artifactId>
+      <version>${spring-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -142,6 +148,12 @@
         <configuration>
           <scanIntervalSeconds>1</scanIntervalSeconds>
           <webAppSourceDirectory>${basedir}/src/webapp</webAppSourceDirectory>
+          <systemProperties>
+            <systemProperty>
+              <name>org.mortbay.jetty.webapp.parentLoaderPriority</name>
+              <value>true</value>
+            </systemProperty>
+          </systemProperties>
         </configuration>
       </plugin>
       <plugin>

Modified: incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/activemq.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/activemq.xml?view=diff&rev=492842&r1=492841&r2=492842
==============================================================================
--- incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/activemq.xml (original)
+++ incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/activemq.xml Thu Jan  4 17:32:37 2007
@@ -20,7 +20,13 @@
 <!-- START SNIPPET: xbean -->
 <beans xmlns:amq="http://activemq.org/config/1.0">
   
-  <amq:broker id="broker" useJmx="true">
+  <amq:broker id="broker" depends-on="jmxServer">
+
+    <amq:managementContext>
+      <bean class="org.apache.activemq.broker.jmx.ManagementContext">
+        <property name="createConnector" value="false" />
+      </bean>
+    </amq:managementContext>
 
     <amq:persistenceAdapter>
       <amq:journaledJDBC journalLogFiles="5" dataDirectory="#dataDir"/>

Modified: incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/applicationContext.xml?view=diff&rev=492842&r1=492841&r2=492842
==============================================================================
--- incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/applicationContext.xml (original)
+++ incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/applicationContext.xml Thu Jan  4 17:32:37 2007
@@ -26,12 +26,11 @@
   <sm:container id="jbi"
       rootDir="#rootDir"
       useMBeanServer="true"
-		  createMBeanServer="true" 
+		  createMBeanServer="false"
+      MBeanServer="#jmxServer" 
       installationDirPath="#installDir"
       deploymentDirPath="#deployDir"
 		  monitorInstallationDirectory="true" 
-      dumpStats="true"
-		  statsInterval="10" 
       transactionManager="#transactionManager"
       depends-on="broker">
 
@@ -170,6 +169,7 @@
     <property name="bootstrapContext">
       <bean class="org.jencks.factory.BootstrapContextFactoryBean">
         <property name="threadPoolSize" value="25"/>
+        <property name="transactionManager" ref="transactionManager"/>
       </bean>
     </property>
 

Added: incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/jmx.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/jmx.xml?view=auto&rev=492842
==============================================================================
--- incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/jmx.xml (added)
+++ incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/jmx.xml Thu Jan  4 17:32:37 2007
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+       xmlns:util="http://www.springframework.org/schema/util">
+
+  <!-- RMI registry -->
+  <sm:rmiRegistry id="rmiRegistry" port="1099" />
+  
+  <!-- JMX server -->
+  <sm:jmxServer id="jmxServer" locateExistingServerIfPossible="true" />
+  
+  <!-- JMX Remote connector -->
+  <sm:jmxConnector objectName="connector:name=rmi"
+                   serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi"
+                   threaded="true"
+                   daemon="true" 
+                   depends-on="rmiRegistry" />
+                   
+</beans>

Propchange: incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/jmx.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/jmx.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/jmx.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/web.xml?view=diff&rev=492842&r1=492841&r2=492842
==============================================================================
--- incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/web.xml (original)
+++ incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/web.xml Thu Jan  4 17:32:37 2007
@@ -29,7 +29,7 @@
 
   <context-param>
     <param-name>contextConfigLocation</param-name>
-    <param-value>/WEB-INF/applicationContext.xml /WEB-INF/activemq.xml</param-value>
+    <param-value>/WEB-INF/jmx.xml /WEB-INF/applicationContext.xml /WEB-INF/activemq.xml</param-value>
   </context-param>
   <context-param>
     <param-name>contextClass</param-name>

Modified: incubator/servicemix/trunk/tooling/jbi-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/jbi-maven-plugin/pom.xml?view=diff&rev=492842&r1=492841&r2=492842
==============================================================================
--- incubator/servicemix/trunk/tooling/jbi-maven-plugin/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/jbi-maven-plugin/pom.xml Thu Jan  4 17:32:37 2007
@@ -82,6 +82,11 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>           
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-dao</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
     </dependencies>
 
     <build>