Author: dejanb
Date: Fri Feb 26 14:15:44 2010
New Revision: 916686

URL: http://svn.apache.org/viewvc?rev=916686&view=rev
Log:
merging 910238,911784 - https://issues.apache.org/activemq/browse/AMQ-2599 - Distribution activemq.xml does not match distribution activemq.xsd

Added:
    activemq/branches/activemq-5.3/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
      - copied unchanged from r910238, activemq/trunk/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
    activemq/branches/activemq-5.3/assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java
      - copied unchanged from r910238, activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java
Removed:
    activemq/branches/activemq-5.3/assembly/src/sample-conf/quickMem-example.xml
    activemq/branches/activemq-5.3/assembly/src/sample-conf/rapid-example.xml
    activemq/branches/activemq-5.3/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigTest.java
Modified:
    activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
    activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
    activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java
    activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java
    activemq/branches/activemq-5.3/assembly/pom.xml
    activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml
    activemq/branches/activemq-5.3/assembly/src/release/conf/activemq.xml
    activemq/branches/activemq-5.3/assembly/src/release/conf/camel.xml
    activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-command.xml
    activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-demo.xml
    activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-dynamic-network-broker1.xml
    activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml
    activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-jdbc.xml
    activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-security.xml
    activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-static-network-broker1.xml
    activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-static-network-broker2.xml
    activemq/branches/activemq-5.3/assembly/src/sample-conf/journaledMem-example.xml
    activemq/branches/activemq-5.3/assembly/src/sample-conf/kaha-example.xml
    activemq/branches/activemq-5.3/assembly/src/sample-conf/memory-example.xml
    activemq/branches/activemq-5.3/assembly/src/sample-conf/quickJdbc-example.xml
    activemq/branches/activemq-5.3/pom.xml

Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Fri Feb 26 14:15:44 2010
@@ -594,7 +594,7 @@
         stopper.throwFirstException();
     }
     
-        public boolean checkQueueSize(String queueName) {
+    public boolean checkQueueSize(String queueName) {
         long count = 0;
         long queueSize = 0;
         Map<ActiveMQDestination, Destination> destinationMap = regionBroker.getDestinationMap();

Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java Fri Feb 26 14:15:44 2010
@@ -88,8 +88,8 @@
     protected static final Scheduler scheduler = Scheduler.getInstance();
     private static final Log LOG = LogFactory.getLog(JournalPersistenceAdapter.class);
 
-    private final Journal journal;
-    private final PersistenceAdapter longTermPersistence;
+    private Journal journal;
+    private PersistenceAdapter longTermPersistence;
 
     private final WireFormat wireFormat = new OpenWireFormat();
 
@@ -114,20 +114,27 @@
 
     private final Runnable periodicCheckpointTask = createPeriodicCheckpointTask();
 
+    private TaskRunnerFactory taskRunnerFactory;
+
     public JournalPersistenceAdapter(Journal journal, PersistenceAdapter longTermPersistence, TaskRunnerFactory taskRunnerFactory) throws IOException {
+        setJournal(journal);
+        setTaskRunnerFactory(taskRunnerFactory);
+        setPersistenceAdapter(longTermPersistence);
+    }
+
+    public void setTaskRunnerFactory(TaskRunnerFactory taskRunnerFactory) {
+        this.taskRunnerFactory = taskRunnerFactory;
+    }
 
+    public void setJournal(Journal journal) {
         this.journal = journal;
         journal.setJournalEventListener(this);
-
-        checkpointTask = taskRunnerFactory.createTaskRunner(new Task() {
-            public boolean iterate() {
-                return doCheckpoint();
-            }
-        }, "ActiveMQ Journal Checkpoint Worker");
-
+    }
+    
+    public void setPersistenceAdapter(PersistenceAdapter longTermPersistence) {
         this.longTermPersistence = longTermPersistence;
     }
-
+    
     final Runnable createPeriodicCheckpointTask() {
         return new Runnable() {
             public void run() {
@@ -229,6 +236,12 @@
             return;
         }
 
+        checkpointTask = taskRunnerFactory.createTaskRunner(new Task() {
+            public boolean iterate() {
+                return doCheckpoint();
+            }
+        }, "ActiveMQ Journal Checkpoint Worker");
+
         checkpointExecutor = new ThreadPoolExecutor(maxCheckpointWorkers, maxCheckpointWorkers, 30, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new ThreadFactory() {
             public Thread newThread(Runnable runable) {
                 Thread t = new Thread(runable, "Journal checkpoint worker");

Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java Fri Feb 26 14:15:44 2010
@@ -195,4 +195,10 @@
     public long size(){
         return 0;
     }
+    
+    public void setCreateTransactionStore(boolean create) throws IOException {
+        if (create) {
+            createTransactionStore();
+        }
+    }
 }

Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java Fri Feb 26 14:15:44 2010
@@ -20,14 +20,13 @@
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
+
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.usage.SystemUsage;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleException;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -53,7 +52,24 @@
     private boolean start = true;
     private ApplicationContext applicationContext = null;
     private boolean destroyApplicationContextOnShutdown = false;
+    private boolean destroyApplicationContextOnStop = false;
+
+    Runnable stopContextRunnable = new Runnable() {
+        public void run() {
+            if (applicationContext instanceof ConfigurableApplicationContext) {
+                ((ConfigurableApplicationContext) applicationContext).close();
+            }
+            if (applicationContext instanceof OsgiBundleXmlApplicationContext){
+                try {
+                    ((OsgiBundleXmlApplicationContext)applicationContext).getBundle().stop();
+                } catch (BundleException e) {
+                    LOG.info("Error stopping OSGi bundle " + e, e);
+                }
+            }
 
+        }
+    };
+    
     public XBeanBrokerService() {
     }
 
@@ -69,21 +85,7 @@
             start();
         }
         if (destroyApplicationContextOnShutdown) {
-            addShutdownHook(new Runnable() {
-                public void run() {
-                    if (applicationContext instanceof ConfigurableApplicationContext) {
-	                    ((ConfigurableApplicationContext) applicationContext).close();
-                    }
-                    if (applicationContext instanceof OsgiBundleXmlApplicationContext){
-                        try {
-                            ((OsgiBundleXmlApplicationContext)applicationContext).getBundle().stop();
-                        } catch (BundleException e) {
-                            LOG.info("Error stopping OSGi bundle " + e, e);
-                        }
-                    }
-
-                }
-            });
+            addShutdownHook(stopContextRunnable);
         }
     }
 
@@ -107,9 +109,15 @@
         stop();
     }
 
-    public boolean isStart() {
-        return start;
-    }
+    
+   @Override
+   public void stop() throws Exception {      
+       if (destroyApplicationContextOnStop) {
+           stopContextRunnable.run();
+       }
+       super.stop();
+   }
+    
 
     /**
      * Sets whether or not the broker is started along with the ApplicationContext it is defined within.
@@ -121,12 +129,20 @@
     }
 
     /**
-     * Sets whether the broker should shutdown the ApplicationContext when the broker is stopped.
+     * Sets whether the broker should shutdown the ApplicationContext when the broker jvm is shutdown.
      * The broker can be stopped because the underlying JDBC store is unavailable for example.
      */
     public void setDestroyApplicationContextOnShutdown(boolean destroy) {
         this.destroyApplicationContextOnShutdown = destroy;
     }
+    
+    /**
+     * Sets whether the broker should shutdown the ApplicationContext when the broker is stopped.
+     * The broker can be stopped because the underlying JDBC store is unavailable for example.
+     */
+    public void setDestroyApplicationContextOnStop(boolean destroy) {
+        this.destroyApplicationContextOnStop = destroy;
+    }
 
 	public void setApplicationContext(ApplicationContext applicationContext)
 			throws BeansException {

Modified: activemq/branches/activemq-5.3/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/pom.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/pom.xml (original)
+++ activemq/branches/activemq-5.3/assembly/pom.xml Fri Feb 26 14:15:44 2010
@@ -224,7 +224,10 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
     </dependency>
-    
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
     <dependency>
        <groupId>org.apache.xbean</groupId>
        <artifactId>xbean-spring</artifactId>
@@ -325,6 +328,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>test</scope>
+    </dependency>
     
     <!-- dependencies specific to this module -->
     <dependency>
@@ -370,9 +378,18 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkMode>pertest</forkMode>
-        </configuration>
+        <executions>
+          <execution>
+            <id>validate-config</id>
+            <phase>test</phase>
+            <goals>
+             <goal>test</goal>
+            </goals>
+            <configuration>
+             <forkMode>pertest</forkMode>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -417,6 +434,30 @@
           <url>broker:(tcp://localhost:61616)?useJmx=false</url>
         </configuration>
       </plugin -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-conf</id>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/conf</outputDirectory>
+              <resources> 
+                <resource>
+                  <directory>src/release/conf</directory>
+                </resource>
+                <resource>
+                  <directory>src/sample-conf</directory>
+                </resource>
+              </resources> 
+            </configuration>            
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

Modified: activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml Fri Feb 26 14:15:44 2010
@@ -157,13 +157,11 @@
       <scope>runtime</scope>
       <includes>
         <include>commons-logging:commons-logging</include>
-        <include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
         <include>${pom.groupId}:activemq-core</include>
         <include>${pom.groupId}:activemq-console</include>
         <include>${pom.groupId}:activemq-jaas</include>
         <include>${pom.groupId}:kahadb</include>
         <include>org.apache.activemq.protobuf:activemq-protobuf</include>
-        <include>mx4j:mx4j</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
         <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
         <include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
@@ -192,7 +190,6 @@
         <include>${pom.groupId}:activemq-optional</include>
         <include>${pom.groupId}:activemq-pool</include>
         <include>${pom.groupId}:activemq-xmpp</include>
-        <include>${pom.groupId}:activecluster</include>
         <include>${pom.groupId}:activeio-core</include>
         <include>${pom.groupId}:activemq-jmdns_1.0</include>
         <include>commons-beanutils:commons-beanutils</include>
@@ -204,12 +201,8 @@
         <include>commons-net:commons-net</include>
         <include>commons-lang:commons-lang</include>
         <include>log4j:log4j</include>
-        <include>mx4j:mx4j-remote</include>
-        <include>mx4j:mx4j-tools</include>
-        <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
         <include>org.apache.xbean:xbean-spring</include>
-        <include>org.mortbay.jetty:jetty-client</include>
         <include>org.springframework:spring-aop</include>
         <include>org.springframework:spring-core</include>
         <include>org.springframework:spring-beans</include>
@@ -218,12 +211,13 @@
         <include>org.springframework:spring-jms</include>
         <include>com.thoughtworks.xstream:xstream</include>
         <include>xmlpull:xmlpull</include>
-        <include>org.apache.hadoop.zookeeper:zookeeper</include>
         <include>org.codehaus.woodstox:wstx-asl</include>
         <include>org.springframework.ws:spring-oxm-tiger</include>
         <include>org.codehaus.jettison:jettison</include>
         <include>org.apache.velocity:velocity</include>
         <include>net.sf.josql:josql</include>
+        <include>org.osgi:org.osgi.core</include>
+        <include>org.springframework.osgi:spring-osgi-core</include>
       </includes>
     </dependencySet>
     <dependencySet>

Modified: activemq/branches/activemq-5.3/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/release/conf/activemq.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/release/conf/activemq.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/release/conf/activemq.xml Fri Feb 26 14:15:44 2010
@@ -31,31 +31,8 @@
     <!-- 
         The <broker> element is used to configure the ActiveMQ broker. 
     -->
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.base}/data">
-        
-        <!-- 
-            The managementContext is used to configure how ActiveMQ is exposed in 
-            JMX. By default, ActiveMQ uses the MBean server that is started by 
-            the JVM. For more information, see: 
-            
-            http://activemq.apache.org/jmx.html 
-        -->
-        <managementContext>
-            <managementContext createConnector="false"/>
-        </managementContext>
-
-        <!-- 
-            Configure message persistence for the broker. The default persistence
-            mechanism is the KahaDB store (identified by the kahaDB tag). 
-            For more information, see: 
-            
-            http://activemq.apache.org/persistence.html 
-        -->
-        <persistenceAdapter>
-            <kahaDB directory="${activemq.base}/data/kahadb"/>
-        </persistenceAdapter>
-        
-        
+    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.base}/data" destroyApplicationContextOnStop="true">
+ 
         <!--
 			For better performances use VM cursor and small memory limit.
 			For more information, see:
@@ -90,7 +67,31 @@
             </policyMap>
         </destinationPolicy> 
  
-         <!--
+        
+        <!-- 
+            The managementContext is used to configure how ActiveMQ is exposed in 
+            JMX. By default, ActiveMQ uses the MBean server that is started by 
+            the JVM. For more information, see: 
+            
+            http://activemq.apache.org/jmx.html 
+        -->
+        <managementContext>
+            <managementContext createConnector="false"/>
+        </managementContext>
+
+        <!-- 
+            Configure message persistence for the broker. The default persistence
+            mechanism is the KahaDB store (identified by the kahaDB tag). 
+            For more information, see: 
+            
+            http://activemq.apache.org/persistence.html 
+        -->
+        <persistenceAdapter>
+            <kahaDB directory="${activemq.base}/data/kahadb"/>
+        </persistenceAdapter>
+        
+        
+          <!--
             The systemUsage controls the maximum amount of space the broker will 
             use before slowing down producers. For more information, see:
             

Modified: activemq/branches/activemq-5.3/assembly/src/release/conf/camel.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/release/conf/camel.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/release/conf/camel.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/release/conf/camel.xml Fri Feb 26 14:15:44 2010
@@ -26,13 +26,16 @@
     e.g. <import resource="camel.xml"/>
 -->
 <beans
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-    <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+   xmlns="http://www.springframework.org/schema/beans"  
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+  
+  	<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
 
         <!-- You can use a <packages> element for each root package to search for Java routes -->
         <packageScan>
-           <packages>org.foo.bar</packages>
+           <package>org.foo.bar</package>
         </packageScan>
 
         <!-- You can use Spring XML syntax to define the routes here using the <route> element -->

Modified: activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-command.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-command.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-command.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-command.xml Fri Feb 26 14:15:44 2010
@@ -25,7 +25,16 @@
     
     e.g. $ bin/activemq xbean:conf/activemq-command.xml
  -->
-<beans>
+ <beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:amq="http://activemq.apache.org/schema/core"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+  
+     <!-- Allows us to use system properties as variables in this configuration file -->
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ 
     <broker xmlns="http://activemq.apache.org/schema/core" brokerName="command-broker" dataDirectory="${activemq.base}/data">
         <managementContext>
             <managementContext createConnector="true"/>
@@ -34,6 +43,7 @@
         <transportConnectors>
             <!-- Create a XMPP transport for XMPP clients. -->
             <transportConnector name="xmpp" uri="xmpp://localhost:61222"/>
+            <transportConnector name="openwire" uri="tcp://0.0.0.0:61616"/>
         </transportConnectors>
     </broker>
     

Modified: activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-demo.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-demo.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-demo.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-demo.xml Fri Feb 26 14:15:44 2010
@@ -23,11 +23,10 @@
  -->
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
-  http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
+  http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <!-- 
         Allows us to use system properties as variables in this configuration 
@@ -48,7 +47,7 @@
           - Change the brokerName attribute to something unique  
     -->
 
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="amq-broker" useJmx="true">
+    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="amq-broker" useJmx="true" destroyApplicationContextOnStop="true">
 
         <!-- 
             Examples of destination-specific policies using destination 
@@ -139,9 +138,9 @@
             Configure the following if you wish to use journaled JDBC for message 
             persistence. 
         
-        <persistenceAdapter>
+        <persistenceFactory>
             <journaledJDBC dataDirectory="${activemq.base}/data" dataSource="#postgres-ds"/>
-        </persistenceAdapter>
+        </persistenceFactory>
         -->
 
         <!-- 
@@ -214,35 +213,18 @@
       
        http://activemq.apache.org/enterprise-integration-patterns.html
     -->
-    <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
-
-        <!-- You can use a <package> element for each root package to search for Java routes -->
-        <package>org.foo.bar</package>
+    <import resource="camel.xml"/>
 
-        <!-- You can use Spring XML syntax to define the routes here using the <route> element -->
-        <route>
-            <from uri="activemq:example.A"/>
-            <to uri="activemq:example.B"/>
-        </route>
-    </camelContext>
 
-    <!--
-       Lets configure some Camel endpoints
-    
-       http://activemq.apache.org/camel/components.html
+    <!-- 
+        An embedded servlet engine for serving up the Admin console and other demos. 
+        For more information, see: 
+        
+          http://activemq.apache.org/web-console.html
     -->
-
-    <!-- configure the camel activemq component to use the current broker -->
-    <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent" >
-        <property name="connectionFactory">
-          <bean class="org.apache.activemq.ActiveMQConnectionFactory">
-            <property name="brokerURL" value="vm://localhost?create=false&amp;waitForStart=10000" />
-            <property name="userName" value="${activemq.username}"/>
-            <property name="password" value="${activemq.password}"/>
-          </bean>
-        </property>
-    </bean>
-
+    <import resource="jetty.xml"/>
+    
+    
     <!-- 
         Uncomment to create a command agent to respond to message based admin 
         commands on the ActiveMQ.Agent topic. For more information, see: 
@@ -254,24 +236,6 @@
 
 
     <!-- 
-        An embedded servlet engine for serving up the Admin console and other demos. 
-        For more information, see: 
-        
-          http://activemq.apache.org/web-console.html
-    -->
-    <jetty xmlns="http://mortbay.com/schemas/jetty/1.0">
-        <connectors>
-            <nioConnector port="8161"/>
-        </connectors>
-
-        <handlers>
-            <webAppContext contextPath="/admin" resourceBase="${activemq.base}/webapps/admin" logUrlOnStart="true"/>
-            <webAppContext contextPath="/demo" resourceBase="${activemq.base}/webapps/demo" logUrlOnStart="true"/>
-            <webAppContext contextPath="/fileserver" resourceBase="${activemq.base}/webapps/fileserver" logUrlOnStart="true"/>
-        </handlers>
-    </jetty>
-
-    <!-- 
         This xbean configuration file supports all the standard Spring XML 
         configuration options such as the following bean definitions. 
     -->

Modified: activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-dynamic-network-broker1.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-dynamic-network-broker1.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-dynamic-network-broker1.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-dynamic-network-broker1.xml Fri Feb 26 14:15:44 2010
@@ -41,32 +41,6 @@
 
     <broker xmlns="http://activemq.apache.org/schema/core" brokerName="dynamic-broker1" dataDirectory="${activemq.base}/data">
 
-        <!-- First let's configure connectors -->
-
-        <!--
-            Configure network connector to use multicast protocol
-            For more information, see
-            
-            http://activemq.apache.org/multicast-transport-reference.html
-        -->
-	    <networkConnectors>
-	      <networkConnector uri="multicast://default"
-	        dynamicOnly="true" 
-	        networkTTL="3" 
-	        prefetchSize="1" 
-	        decreaseNetworkConsumerPriority="true" />
-	    </networkConnectors>
-	    
-	    <!-- 
-            The transport connectors ActiveMQ will listen to
-            Configure discovery URI to use multicast protocol
-        -->
-        <transportConnectors>
-            <transportConnector name="openwire" uri="tcp://0.0.0.0:61616" discoveryUri="multicast://default" />
-        </transportConnectors>
-        
-        <!-- Now configure the rest of the desired broker behavior -->
-
         <!-- Destination specific policies using destination names or wildcards -->
         <destinationPolicy>
             <policyMap>
@@ -87,6 +61,20 @@
             <managementContext createConnector="true"/>
         </managementContext>
 
+        <!--
+            Configure network connector to use multicast protocol
+            For more information, see
+            
+            http://activemq.apache.org/multicast-transport-reference.html
+        -->
+	    <networkConnectors>
+	      <networkConnector uri="multicast://default"
+	        dynamicOnly="true" 
+	        networkTTL="3" 
+	        prefetchSize="1" 
+	        decreaseNetworkConsumerPriority="true" />
+	    </networkConnectors>
+	    
         <persistenceAdapter>
             <kahaDB directory="${activemq.base}/data/dynamic-broker1/kahadb"/>
         </persistenceAdapter>
@@ -106,6 +94,15 @@
             </systemUsage>
         </systemUsage>
 
+	    <!-- 
+            The transport connectors ActiveMQ will listen to
+            Configure discovery URI to use multicast protocol
+        -->
+        <transportConnectors>
+            <transportConnector name="openwire" uri="tcp://0.0.0.0:61616" discoveryUri="multicast://default" />
+        </transportConnectors>
+        
+
     </broker>
 
 </beans>

Modified: activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml Fri Feb 26 14:15:44 2010
@@ -42,32 +42,6 @@
 
     <broker xmlns="http://activemq.apache.org/schema/core" brokerName="dynamic-broker2" dataDirectory="${activemq.base}/data">
 
-        <!-- First let's configure connectors -->
-
-        <!--
-            Configure network connector to use multicast protocol
-            For more information, see
-            
-            http://activemq.apache.org/multicast-transport-reference.html
-        -->
-        <networkConnectors>
-          <networkConnector uri="multicast://default"
-            dynamicOnly="true" 
-            networkTTL="3" 
-            prefetchSize="1" 
-            decreaseNetworkConsumerPriority="true" />
-        </networkConnectors>
-        
-        <!-- 
-            The transport connectors ActiveMQ will listen to
-            Configure discovery URI to use multicast protocol
-        -->
-        <transportConnectors>
-            <transportConnector name="openwire" uri="tcp://0.0.0.0:61618" discoveryUri="multicast://default" />
-        </transportConnectors>
-
-        <!-- Now configure the rest of the desired broker behavior -->
-
         <!-- Destination specific policies using destination names or wildcards -->
         <destinationPolicy>
             <policyMap>
@@ -87,6 +61,21 @@
         <managementContext>
             <managementContext createConnector="true" connectorPort="1100"/>
         </managementContext>
+
+        <!--
+            Configure network connector to use multicast protocol
+            For more information, see
+            
+            http://activemq.apache.org/multicast-transport-reference.html
+        -->
+        <networkConnectors>
+          <networkConnector uri="multicast://default"
+            dynamicOnly="true" 
+            networkTTL="3" 
+            prefetchSize="1" 
+            decreaseNetworkConsumerPriority="true" />
+        </networkConnectors>
+        
 	
 	    <persistenceAdapter>
 	        <kahaDB directory="${activemq.base}/data/dynamic-broker2/kahadb" />
@@ -107,6 +96,14 @@
 	        </systemUsage>
 	    </systemUsage>
 
+        <!-- 
+            The transport connectors ActiveMQ will listen to
+            Configure discovery URI to use multicast protocol
+        -->
+        <transportConnectors>
+            <transportConnector name="openwire" uri="tcp://0.0.0.0:61618" discoveryUri="multicast://default" />
+        </transportConnectors>
+
     </broker>
 
 </beans>

Modified: activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-jdbc.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-jdbc.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-jdbc.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-jdbc.xml Fri Feb 26 14:15:44 2010
@@ -28,7 +28,11 @@
     
     e.g. $ bin/activemq xbean:conf/activemq-jdbc.xml
  -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
   
   <broker useJmx="false" brokerName="jdbcBroker" xmlns="http://activemq.apache.org/schema/core">
     <persistenceAdapter>

Modified: activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-security.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-security.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-security.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-security.xml Fri Feb 26 14:15:44 2010
@@ -38,7 +38,7 @@
       </property>      
   </bean>
 
-  <broker useJmx="true" persistent="false" xmlns="http://activemq.apache.org/schema/core">
+  <broker useJmx="true" persistent="false" xmlns="http://activemq.apache.org/schema/core" destroyApplicationContextOnStop="true">
 
     <plugins>
         <!-- Configure authentication; Username, passwords and groups -->

Modified: activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-static-network-broker1.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-static-network-broker1.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-static-network-broker1.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-static-network-broker1.xml Fri Feb 26 14:15:44 2010
@@ -43,23 +43,6 @@
 
     <broker xmlns="http://activemq.apache.org/schema/core" brokerName="static-broker1" dataDirectory="${activemq.base}/data">
 
-        <!-- First let's configure connectors -->
-
-        <!-- 
-            The store and forward broker networks ActiveMQ will listen to.
-            We'll leave it empty as duplex network will be configured by another broker
-            Take a look at activemq-static_network-broker2.xml for example
-        -->
-        <networkConnectors>
-        </networkConnectors>
-        
-        <!-- The transport connectors ActiveMQ will listen to -->
-        <transportConnectors>
-            <transportConnector name="openwire" uri="tcp://0.0.0.0:61616"/>
-        </transportConnectors>
-        
-        <!-- Now configure the rest of the desired broker behavior -->
-
         <!-- Destination specific policies using destination names or wildcards -->
         <destinationPolicy>
             <policyMap>
@@ -80,6 +63,14 @@
             <managementContext createConnector="true"/>
         </managementContext>
 
+        <!-- 
+            The store and forward broker networks ActiveMQ will listen to.
+            We'll leave it empty as duplex network will be configured by another broker
+            Take a look at activemq-static_network-broker2.xml for example
+        -->
+        <networkConnectors>
+        </networkConnectors>
+        
         <persistenceAdapter>
             <kahaDB directory="${activemq.base}/data/static-broker1/kahadb" />
         </persistenceAdapter>
@@ -99,6 +90,11 @@
             </systemUsage>
         </systemUsage>
 
+        <!-- The transport connectors ActiveMQ will listen to -->
+        <transportConnectors>
+            <transportConnector name="openwire" uri="tcp://0.0.0.0:61616"/>
+        </transportConnectors>
+        
     </broker>
 
 </beans>

Modified: activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-static-network-broker2.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-static-network-broker2.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-static-network-broker2.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-static-network-broker2.xml Fri Feb 26 14:15:44 2010
@@ -43,23 +43,6 @@
 
     <broker xmlns="http://activemq.apache.org/schema/core" brokerName="static-broker1" dataDirectory="${activemq.base}/data">
 
-        <!-- First let's configure connectors -->
-        
-        <!-- 
-            The store and forward broker networks ActiveMQ will listen to
-            Create a duplex connector to the first broker 
-        -->
-        <networkConnectors>
-            <networkConnector uri="static:(tcp://localhost:61616)" duplex="true"/>
-        </networkConnectors>
-        
-        <!-- The transport connectors ActiveMQ will listen to -->
-        <transportConnectors>
-            <transportConnector name="openwire" uri="tcp://0.0.0.0:61618"/>
-        </transportConnectors>
-        
-        <!-- Now configure the rest of the desired broker behavior -->
-
         <!-- Destination specific policies using destination names or wildcards -->
         <destinationPolicy>
             <policyMap>
@@ -80,6 +63,14 @@
             <managementContext createConnector="true" connectorPort="1100"/>
         </managementContext>
 
+        <!-- 
+            The store and forward broker networks ActiveMQ will listen to
+            Create a duplex connector to the first broker 
+        -->
+        <networkConnectors>
+            <networkConnector uri="static:(tcp://localhost:61616)" duplex="true"/>
+        </networkConnectors>
+        
         <persistenceAdapter>
             <kahaDB directory="${activemq.base}/data/static-broker2/kahadb" />
         </persistenceAdapter>
@@ -99,6 +90,11 @@
             </systemUsage>
         </systemUsage>
 
+        <!-- The transport connectors ActiveMQ will listen to -->
+        <transportConnectors>
+            <transportConnector name="openwire" uri="tcp://0.0.0.0:61618"/>
+        </transportConnectors>
+        
     </broker>
 
 </beans>

Modified: activemq/branches/activemq-5.3/assembly/src/sample-conf/journaledMem-example.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/sample-conf/journaledMem-example.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/sample-conf/journaledMem-example.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/sample-conf/journaledMem-example.xml Fri Feb 26 14:15:44 2010
@@ -16,29 +16,35 @@
     limitations under the License.
 -->
 
-<beans xmlns:amq="http://activemq.apache.org/schema/core">
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:amq="http://activemq.apache.org/schema/core"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
 
     <amq:broker brokerName="journaledMemBroker" start="false" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">
 
-        <amq:transportConnectors>
-            <amq:transportConnector uri="tcp://localhost:61616"/>
-        </amq:transportConnectors>
-
         <amq:persistenceAdapter>
             <amq:journalPersistenceAdapter>
-                <constructor-arg index="0">
+                <amq:journal>
                     <ref bean="myJournalImpl"/>
-                </constructor-arg>
+                </amq:journal>
 
-                <constructor-arg index="1">
-                    <amq:memoryPersistenceAdapter init-method="createTransactionStore"/>
-                </constructor-arg>
+                <amq:persistenceAdapter>
+                    <amq:memoryPersistenceAdapter createTransactionStore="true"/>
+                </amq:persistenceAdapter>
 
-                <constructor-arg index="2">
+                <amq:taskRunnerFactory>
                     <bean id="myTaskRunnerFactory" class="org.apache.activemq.thread.TaskRunnerFactory"/>
-                </constructor-arg>
+                </amq:taskRunnerFactory>
             </amq:journalPersistenceAdapter>
         </amq:persistenceAdapter>
+
+        <amq:transportConnectors>
+            <amq:transportConnector uri="tcp://localhost:61616"/>
+        </amq:transportConnectors>
+
     </amq:broker>
 
     <!-- The journal implementation that will be used -->

Modified: activemq/branches/activemq-5.3/assembly/src/sample-conf/kaha-example.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/sample-conf/kaha-example.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/sample-conf/kaha-example.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/sample-conf/kaha-example.xml Fri Feb 26 14:15:44 2010
@@ -15,17 +15,25 @@
     limitations under the License.
 -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:amq="http://activemq.apache.org/schema/core"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+  
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="broker" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
+
+    <persistenceAdapter>
+      <kahaPersistenceAdapter directory = "${activemq.home}/activemq-data"/>
+    </persistenceAdapter>
+
      <transportConnectors>
       <transportConnector uri="tcp://localhost:61616"/>
     </transportConnectors>
 
-    <persistenceAdapter>
-      <kahaPersistenceAdapter dir = "${activemq.home}/activemq-data"/>
-    </persistenceAdapter>
   </broker>
 
 </beans>

Modified: activemq/branches/activemq-5.3/assembly/src/sample-conf/memory-example.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/sample-conf/memory-example.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/sample-conf/memory-example.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/sample-conf/memory-example.xml Fri Feb 26 14:15:44 2010
@@ -15,8 +15,13 @@
     limitations under the License.
 -->
 <!-- START SNIPPET: xbean -->
-<beans>
-  
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:amq="http://activemq.apache.org/schema/core"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+    
   <broker useJmx="false" brokerName="memoryBroker" xmlns="http://activemq.apache.org/schema/core">
     <persistenceAdapter>
        <memoryPersistenceAdapter/>

Modified: activemq/branches/activemq-5.3/assembly/src/sample-conf/quickJdbc-example.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/sample-conf/quickJdbc-example.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/sample-conf/quickJdbc-example.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/sample-conf/quickJdbc-example.xml Fri Feb 26 14:15:44 2010
@@ -15,10 +15,14 @@
     limitations under the License.
 -->
 <!-- START SNIPPET: xbean -->
-<beans>
-  
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+    
   <broker useJmx="false" brokerName="quickJdbcBroker" xmlns="http://activemq.apache.org/schema/core">
-    <persistenceAdapter>
+    <persistenceFactory>
        <journaledJDBC journalLogFiles="4" 
                       journalLogFileSize="32768" 
 		      useJournal="true" 
@@ -26,7 +30,7 @@
 		      dataSource="#derby-ds" 
 		      dataDirectory="target/quickJdbc-data"/>
 		      
-    </persistenceAdapter>
+    </persistenceFactory>
   
     <transportConnectors>
        <transportConnector name="default" uri="tcp://localhost:61616"/>

Modified: activemq/branches/activemq-5.3/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/pom.xml?rev=916686&r1=916685&r2=916686&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/pom.xml (original)
+++ activemq/branches/activemq-5.3/pom.xml Fri Feb 26 14:15:44 2010
@@ -422,7 +422,6 @@
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.core</artifactId>
         <version>4.1.0</version>
-        <scope>provided</scope>
       </dependency>
 
       <dependency>