Return-Path: 
 <commits-return-5217-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 34766 invoked from network); 9 Mar 2007 15:52:39 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 9 Mar 2007 15:52:39 -0000
Received: (qmail 25815 invoked by uid 500); 9 Mar 2007 15:52:47 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 25796 invoked by uid 500); 9 Mar 2007 15:52:47 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 25787 invoked by uid 99); 9 Mar 2007 15:52:47 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Mar 2007 07:52:47 -0800
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Mar 2007 07:52:37 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 58FB71A9842; Fri,  9 Mar 2007 07:52:17 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r516442 - in /activemq/trunk: ./ assembly/
 assembly/src/main/descriptors/ assembly/src/main/resources/META-INF/
 assembly/src/release/conf/
Date: Fri, 09 Mar 2007 15:52:15 -0000
To: commits@activemq.apache.org
From: jstrachan@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070309155217.58FB71A9842@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jstrachan
Date: Fri Mar  9 07:52:13 2007
New Revision: 516442

URL: http://svn.apache.org/viewvc?view=rev&rev=516442
Log:
Tidied up the activemq.xml file shipped in the distro. Also by default we now embded Jetty so that we can include the web console, or an out of band file transfer mechanism by default

Removed:
    activemq/trunk/assembly/src/main/resources/META-INF/DISCLAIMER.txt
    activemq/trunk/assembly/src/release/conf/activemq-nojournal.xml
Modified:
    activemq/trunk/assembly/pom.xml
    activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
    activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
    activemq/trunk/assembly/src/release/conf/activemq.xml
    activemq/trunk/assembly/src/release/conf/log4j.properties
    activemq/trunk/pom.xml

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?view=diff&rev=516442&r1=516441&r2=516442
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Fri Mar  9 07:52:13 2007
@@ -51,6 +51,10 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-core</artifactId>
       <type>test-jar</type>
     </dependency>
     <dependency>
@@ -84,6 +88,11 @@
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-web-console</artifactId>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
       <artifactId>activemq-rar</artifactId>
       <type>rar</type>
       <optional>true</optional>
@@ -178,6 +187,10 @@
       <artifactId>jetty-util</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-xbean</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
       <optional>true</optional>
@@ -187,7 +200,31 @@
       <artifactId>derbynet</artifactId>
       <optional>true</optional>
     </dependency>
-    
+
+    <!-- copied dependencies from activemq-web-console -->
+    <!-- enable commons-logging when inside jetty6:run -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jcl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>sitemesh</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-2.1</artifactId>
+    </dependency>
+                           
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

Modified: activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml?view=diff&rev=516442&r1=516441&r2=516442
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Fri Mar  9 07:52:13 2007
@@ -132,9 +132,6 @@
          <include>commons-httpclient:commons-httpclient</include>
          <include>commons-dbcp:commons-dbcp</include>
          <include>commons-pool:commons-pool</include>
-         <include>org.mortbay.jetty:jetty</include>
-         <include>org.mortbay.jetty:jetty-util</include>
-         <include>org.mortbay.jetty:servlet-api-2.5</include>
          <include>log4j:log4j</include>
          <include>mx4j:mx4j-remote</include>
          <include>mx4j:mx4j-tools</include>
@@ -146,6 +143,29 @@
          <include>xstream:xstream</include>
          <include>xmlpull:xmlpull</include>
          <include>activemq:jmdns</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>/lib/web</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <includes>
+         <include>org.mortbay.jetty:jetty</include>
+         <include>org.mortbay.jetty:jetty-util</include>
+         <include>org.mortbay.jetty:jetty-xbean</include>
+         <include>org.mortbay.jetty:servlet-api-2.5</include>
+        <include>org.slf4j:slf4j-jcl</include>
+
+        <!-- JSP support -->
+         <include>org.mortbay.jetty:jsp-2.1</include>
+         <include>org.mortbay.jetty:jsp-api-2.1</include>
+         <include>org.eclipse.jdt:core</include>
+         <include>ant:ant</include>
+
+         <!-- JSTL and other web stuff -->
+         <include>opensymphony:sitemesh</include>
+         <include>javax.servlet:jstl</include>
+         <include>taglibs:standard</include>
       </includes>
     </dependencySet>
   </dependencySets>  

Modified: activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml?view=diff&rev=516442&r1=516441&r2=516442
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Fri Mar  9 07:52:13 2007
@@ -152,5 +152,28 @@
          <include>activemq:jmdns</include>
       </includes>
     </dependencySet>
+    <dependencySet>
+      <outputDirectory>/lib/web</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <includes>
+         <include>org.mortbay.jetty:jetty</include>
+         <include>org.mortbay.jetty:jetty-util</include>
+         <include>org.mortbay.jetty:jetty-xbean</include>
+         <include>org.mortbay.jetty:servlet-api-2.5</include>
+        <include>org.slf4j:slf4j-jcl</include>
+
+        <!-- JSP support -->
+         <include>org.mortbay.jetty:jsp-2.1</include>
+         <include>org.mortbay.jetty:jsp-api-2.1</include>
+         <include>org.eclipse.jdt:core</include>
+         <include>ant:ant</include>
+
+         <!-- JSTL and other web stuff -->
+         <include>opensymphony:sitemesh</include>
+         <include>javax.servlet:jstl</include>
+         <include>taglibs:standard</include>
+      </includes>
+    </dependencySet>
   </dependencySets>  
 </assembly>

Modified: activemq/trunk/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/activemq.xml?view=diff&rev=516442&r1=516441&r2=516442
==============================================================================
--- activemq/trunk/assembly/src/release/conf/activemq.xml (original)
+++ activemq/trunk/assembly/src/release/conf/activemq.xml Fri Mar  9 07:52:13 2007
@@ -20,51 +20,35 @@
   <!-- Allows us to use system properties as variables in this configuration file -->
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
   
-  <broker brokerName="localhost" useJmx="true" xmlns="http://activemq.org/config/1.0">
+  <broker xmlns="http://activemq.org/config/1.0" brokerName="localhost" dataDirectory="${activemq.base}/data">
   
-    <!--  Use the following to set the broker memory limit 
-    <memoryManager>  
-        <usageManager id="memory-manager" limit="20 MB"/>
-    </memoryManager>
-    -->
-    
-    <!-- Use the following to configure how ActiveMQ is exposed in JMX
-    <managementContext>
-       <managementContext connectorPort="1099" jmxDomainName="org.apache.activemq"/>
-    </managementContext>
-    -->
-
-    <!-- In ActiveMQ 4, you can setup destination policies -->  
+    <!-- Destination specific policies using destination names or wildcards -->
     <destinationPolicy>
-      <policyMap><policyEntries>
-        
+      <policyMap>
+        <policyEntries>
+
           <policyEntry topic="FOO.>">
             <dispatchPolicy>
-              <strictOrderDispatchPolicy />
+              <strictOrderDispatchPolicy/>
             </dispatchPolicy>
             <subscriptionRecoveryPolicy>
-              <lastImageSubscriptionRecoveryPolicy />
+              <lastImageSubscriptionRecoveryPolicy/>
             </subscriptionRecoveryPolicy>
           </policyEntry>
 
-      </policyEntries></policyMap>
+        </policyEntries>
+      </policyMap>
     </destinationPolicy>
-  
-  
-    <persistenceAdapter>
-        <journaledJDBC journalLogFiles="5" dataDirectory="${activemq.base}/activemq-data"/>
-      <!-- To use a different datasource, use the following syntax : -->
-      <!-- 
-      <journaledJDBC journalLogFiles="5" dataDirectory="../activemq-data" dataSource="#postgres-ds"/>
-       -->
-    </persistenceAdapter>
-  
+
+
+    <!-- The transport connectors ActiveMQ will listen to -->
     <transportConnectors>
        <transportConnector name="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
        <transportConnector name="ssl"     uri="ssl://localhost:61617"/>
        <transportConnector name="stomp"   uri="stomp://localhost:61613"/>
     </transportConnectors>
-    
+
+    <!-- The store and forward broker networks ActiveMQ will listen to -->
     <networkConnectors>
       <!-- by default just auto discover the other brokers -->
       <networkConnector name="default-nc" uri="multicast://default"/>
@@ -72,12 +56,53 @@
       <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)" failover="true"/>
       -->
     </networkConnectors>
+
+
+    <!-- Use the following if you wish to configure the journal with JDBC -->
+    <!--
+    <persistenceAdapter>
+        <journaledJDBC journalLogFiles="5" dataDirectory="${activemq.base}/activemq-data"  dataSource="#postgres-ds"/>
+    </persistenceAdapter>
+    -->
+
+    <!-- Or if you want to use pure JDBC without a journal -->
+    <!--
+    <persistenceAdapter>
+        <jdbcPersistenceAdapter dataSource="#postgres-ds"/>
+    </persistenceAdapter>
+    -->
+
+    <!--  Use the following to set the broker memory limit
+    <memoryManager>  
+        <usageManager id="memory-manager" limit="20 MB"/>
+    </memoryManager>
+    -->
     
+    <!-- Use the following to configure how ActiveMQ is exposed in JMX
+    <managementContext>
+       <managementContext connectorPort="1099" jmxDomainName="org.apache.activemq"/>
+    </managementContext>
+    -->
+
   </broker>
 
   <!-- lets create a command agent to respond to message based admin commands on the ActiveMQ.Agent topic -->
   <commandAgent xmlns="http://activemq.org/config/1.0"/>
 
+
+  <!-- An embedded servlet engine for serving up the Admin console -->
+  <jetty xmlns="http://mortbay.com/schemas/jetty/1.0">
+    <connectors>
+      <nioConnector port="8161" />
+    </connectors>
+
+    <handlers>
+      <webAppContext contextPath="/admin" resourceBase="webapps" parentLoaderPriority="false" />
+    </handlers>
+  </jetty>
+
+
+  
   <!--  This xbean configuration file supports all the standard spring xml configuration options -->
   
   <!-- Postgres DataSource Sample Setup -->

Modified: activemq/trunk/assembly/src/release/conf/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/log4j.properties?view=diff&rev=516442&r1=516441&r2=516442
==============================================================================
--- activemq/trunk/assembly/src/release/conf/log4j.properties (original)
+++ activemq/trunk/assembly/src/release/conf/log4j.properties Fri Mar  9 07:52:13 2007
@@ -36,7 +36,7 @@
 
 # File appender
 log4j.appender.out=org.apache.log4j.RollingFileAppender
-log4j.appender.out.file=${activemq.base}/activemq-data/activemq.log
+log4j.appender.out.file=${activemq.base}/data/activemq.log
 log4j.appender.out.maxFileSize=1024KB
 log4j.appender.out.maxBackupIndex=5
 log4j.appender.out.append=true

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?view=diff&rev=516442&r1=516441&r2=516442
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Mar  9 07:52:13 2007
@@ -591,7 +591,19 @@
 
       <dependency>
         <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jsp-2.1</artifactId>
+        <version>${jetty-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty-util</artifactId>
+        <version>${jetty-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty-xbean</artifactId>
         <version>${jetty-version}</version>
       </dependency>