Title: [726] trunk/tooling/servicemix-web: Update web application sample
Revision
726
Author
gnt
Date
2005-11-02 12:57:24 -0500 (Wed, 02 Nov 2005)

Log Message

Update web application sample

Modified Paths


Diff

Modified: trunk/tooling/servicemix-web/project.xml (725 => 726)

--- trunk/tooling/servicemix-web/project.xml	2005-11-02 13:50:34 UTC (rev 725)
+++ trunk/tooling/servicemix-web/project.xml	2005-11-02 17:57:24 UTC (rev 726)
@@ -2,7 +2,7 @@
 <!DOCTYPE project>
 <project>
   <pomVersion>3</pomVersion>
-  <extend>${basedir}/../../base/project.xml</extend>
+  <extend>${basedir}/../../etc/project.xml</extend>
 
   <name>ServiceMix :: Web</name>
   <id>servicemix-web</id>
@@ -29,17 +29,38 @@
     <dependency>
       <groupId>geronimo-spec</groupId>
       <artifactId>geronimo-spec-servlet</artifactId>
-      <version>2.4-rc4</version>
+      <version>${geronimo_spec_servlet_version}</version>
       <properties>
         <war.bundle>false</war.bundle>
-        <!-- <eclipse.dependency>true</eclipse.dependency> -->
       </properties>
     </dependency>
+    <dependency>
+      <id>geronimo-spec+jms</id>
+      <version>${geronimo_spec_jms_version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
 
     <dependency>
       <groupId>activemq</groupId>
+      <artifactId>activemq</artifactId>
+      <version>${activemq_version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>activemq+ra</id>
+      <version>${activemq_version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>activemq</groupId>
       <artifactId>activemq-web</artifactId>
-      <version>3.2-SNAPSHOT</version>
+      <version>${activemq_version}</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
@@ -52,6 +73,101 @@
         <war.bundle>true</war.bundle>
       </properties>
     </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>${commons_logging_version}</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+    
+    <dependency>
+      <groupId>jetty</groupId>
+      <artifactId>org.mortbay.jetty</artifactId>
+      <version>${org.mortbay.jetty_version}</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>springframework</groupId>
+      <artifactId>spring</artifactId>
+      <version>${spring_version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>xbean</groupId>
+      <artifactId>xbean-spring</artifactId>
+      <version>${xbean_version}</version>
+      <url>http://www.xbean.org</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>jencks+all</id>
+      <version>${jencks_version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>backport-util-concurrent</id>
+      <version>${backport_util_concurrent_version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>concurrent</id>
+      <version>${concurrent_version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>${commons_dbcp_version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>${commons_collections_version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+      <version>${commons_pool_version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>quartz</groupId>
+      <artifactId>quartz</artifactId>
+      <version>${quartz_version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>commons-beanutils</id>
+      <version>${commons_beanutils_version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    
   </dependencies>
 
 </project>

Modified: trunk/tooling/servicemix-web/src/webapp/WEB-INF/applicationContext.xml (725 => 726)

--- trunk/tooling/servicemix-web/src/webapp/WEB-INF/applicationContext.xml	2005-11-02 13:50:34 UTC (rev 725)
+++ trunk/tooling/servicemix-web/src/webapp/WEB-INF/applicationContext.xml	2005-11-02 17:57:24 UTC (rev 726)
@@ -1,29 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:my="http://servicemix.org/demo/">
+<beans xmlns="http://xbean.org/schemas/spring/1.0"
+	xmlns:spring="http://xbean.org/schemas/spring/1.0"
+	xmlns:sm="http://servicemix.org/config/1.0"
+	xmlns:my="http://servicemix.org/demo/"
+  xmlns:foo="http://servicemix.org/demo/">
 
   <!-- the JBI container -->
-  <container id="jbi">
-   <property name="rootDir" value="../wdir"/>
-   <property name="useMBeanServer" value="true"/>
-   <property name="createMBeanServer" value="true"/>
-   <property name="installationDirPath" value="../install"/>
-   <property name="monitorInstallationDirectory" value="true"/>
-   <property name="dumpStats" value="true"/>
-   <property name="statsInterval" value="10"/>
-    <property name="transactionManager" ref="transactionManager"/>
+  <sm:container spring:id="jbi"
+      rootDir"../wdir"
+      useMBeanServer="true"
+		  createMBeanServer="true" 
+      installationDirPath="../install"
+      deploymentDirPath="../deploy"
+		  monitorInstallationDirectory="true" 
+      dumpStats="true"
+		  statsInterval="10" 
+      transactionManager="#transactionManager">
 
-    <components>
+    <sm:activationSpecs>
 
       <!--  an example HTTP binding for use by the SpringBindingServlet  -->
       <!-- START SNIPPET: http -->
-      <component id="httpBinding" service="foo:httpBinding" class="org.servicemix.components.http.HttpInOutBinding" destinationService="foo:echo"/>
+      <sm:activationSpec componentName="httpBinding" service="foo:httpBinding" destinationService="foo:echo">
+        <sm:component><bean class="org.servicemix.components.http.HttpInOutBinding" /></sm:component>
+      </sm:activationSpec>
       <!-- END SNIPPET: http -->
 
       <!--  a simple Echo service to test InOut message exchanges using HTTP-->
-      <component id="echo" service="foo:echo" class="org.servicemix.components.util.EchoComponent"/>
+      <sm:activationSpec componentName="echo" service="foo:echo" >
+        <sm:component><bean class="org.servicemix.components.util.EchoComponent" /></sm:component>
+      </sm:activationSpec>
 
       <!-- lets kick off a timer to send messages on an input destination topic -->
-      <component id="timer" service="my:timer" class="org.servicemix.components.quartz.QuartzComponent" destinationService="my:inputSender">
+      <sm:activationSpec componentName="timer" service="my:timer" destinationService="my:inputSender">
+        <sm:component>
+          <bean class="org.servicemix.components.quartz.QuartzComponent">
         <property name="triggers">
           <map>
             <entry>
@@ -40,9 +51,13 @@
             </entry>
           </map>
         </property>
-      </component>
+          </bean>
+        </sm:component>
+      </sm:activationSpec>
       
-      <component id="inputSender" service="my:inputSender" class="org.servicemix.components.jms.JmsSenderComponent">
+      <sm:activationSpec componentName="inputSender" service="my:inputSender">
+        <sm:component>
+          <bean class="org.servicemix.components.jms.JmsSenderComponent">
         <property name="template">
           <bean class="org.springframework.jms.core.JmsTemplate">
             <property name="connectionFactory">
@@ -52,11 +67,15 @@
             <property name="pubSubDomain" value="true"/>
           </bean>
         </property>
-      </component>
+          </bean>
+        </sm:component>
+      </sm:activationSpec>
 
 
       <!-- lets subscribe and republish on a different JMS destination - i.e. make a JMS bridge -->
-      <component id="inputReceiver" service="my:inputReceiver" class="org.servicemix.components.jms.JmsInUsingJCABinding" destinationService="my:outputSender">
+      <sm:activationSpec componentName="inputReceiver" service="my:inputReceiver" destinationService="my:outputSender">
+        <sm:component>
+          <bean class="org.servicemix.components.jms.JmsInUsingJCABinding">
         <property name="jcaContainer" ref="jencks"/>
         <property name="activationSpec">
           <bean class="org.activemq.ra.ActiveMQActivationSpec">
@@ -64,10 +83,14 @@
             <property name="destinationType" value="javax.jms.Topic"/>
           </bean>
         </property>
-      </component>
+          </bean>
+        </sm:component>
+      </sm:activationSpec>
 
 
-      <component id="outputSender" service="my:outputSender" class="org.servicemix.components.jms.JmsSenderComponent">
+      <sm:activationSpec componentName="outputSender" service="my:outputSender">
+        <sm:component>
+          <bean class="org.servicemix.components.jms.JmsSenderComponent">
         <property name="template">
           <bean class="org.springframework.jms.core.JmsTemplate">
             <property name="connectionFactory">
@@ -77,11 +100,15 @@
             <property name="pubSubDomain" value="true"/>
           </bean>
         </property>
-      </component>
+          </bean>
+        </sm:component>
+      </sm:activationSpec>
 
 
       <!-- just to demonstrate that we are sending messages, lets trace the messages we receive -->
-      <component id="jmsTrace" service="my:jmsTrace" class="org.servicemix.components.jms.JmsInUsingJCABinding" destinationService="my:trace">
+      <sm:activationSpec componentName="jmsTrace" service="my:jmsTrace" destinationService="my:trace">
+        <sm:component>
+          <bean class="org.servicemix.components.jms.JmsInUsingJCABinding">
         <property name="jcaContainer" ref="jencks"/>
         <property name="activationSpec">
           <bean class="org.activemq.ra.ActiveMQActivationSpec">
@@ -89,11 +116,18 @@
             <property name="destinationType" value="javax.jms.Topic"/>
           </bean>
         </property>
-      </component>
+          </bean>
+        </sm:component>
+      </sm:activationSpec>
 
-      <component id="trace" service="my:trace" class="org.servicemix.components.util.TraceComponent"/>
-    </components>
-  </container>
+      <sm:activationSpec componentName="trace" service="my:trace">
+        <sm:component>
+          <bean class="org.servicemix.components.util.TraceComponent"/>
+          </bean>
+        </sm:component>
+      </sm:activationSpec>
+    </sm:activationSpecs>
+  </sm:container>
 
 
   <!-- the JCA container -->

Modified: trunk/tooling/servicemix-web/src/webapp/WEB-INF/web.xml (725 => 726)

--- trunk/tooling/servicemix-web/src/webapp/WEB-INF/web.xml	2005-11-02 13:50:34 UTC (rev 725)
+++ trunk/tooling/servicemix-web/src/webapp/WEB-INF/web.xml	2005-11-02 17:57:24 UTC (rev 726)
@@ -16,7 +16,7 @@
   <context-param>
     <param-name>contextClass</param-name>
     <param-value>
-      org.servicemix.jbi.config.XmlWebApplicationContext
+      org.xbean.spring.context.XmlWebApplicationContext
     </param-value>
   </context-param>
 

Reply via email to