Return-Path: 
 <activemq-commits-return-2278-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org
Received: (qmail 36910 invoked from network); 16 Jun 2006 10:37:23 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 16 Jun 2006 10:37:23 -0000
Received: (qmail 88714 invoked by uid 500); 16 Jun 2006 10:37:23 -0000
Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org
Received: (qmail 88673 invoked by uid 500); 16 Jun 2006 10:37:23 -0000
Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:activemq-commits-help@geronimo.apache.org>
List-Unsubscribe: <mailto:activemq-commits-unsubscribe@geronimo.apache.org>
List-Post: <mailto:activemq-commits@geronimo.apache.org>
List-Id: <activemq-commits.geronimo.apache.org>
Reply-To: activemq-dev@geronimo.apache.org
Delivered-To: mailing list activemq-commits@geronimo.apache.org
Received: (qmail 88663 invoked by uid 99); 16 Jun 2006 10:37:22 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Jun 2006 03:37:22 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Jun 2006 03:37:21 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id BDEA81A983A; Fri, 16 Jun 2006 03:37:01 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r414800 - in /incubator/activemq/site:
 activemq-40-release.html
 download.html features.html masterslave.html tomcat.html
Date: Fri, 16 Jun 2006 10:37:00 -0000
To: activemq-commits@geronimo.apache.org
From: jstrachan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060616103701.BDEA81A983A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jstrachan
Date: Fri Jun 16 03:37:00 2006
New Revision: 414800

URL: http://svn.apache.org/viewvc?rev=414800&view=rev
Log:
latest site changes

Modified:
    incubator/activemq/site/activemq-40-release.html
    incubator/activemq/site/download.html
    incubator/activemq/site/features.html
    incubator/activemq/site/masterslave.html
    incubator/activemq/site/tomcat.html

Modified: incubator/activemq/site/activemq-40-release.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/activemq-40-release.html?rev=414800&r1=414799&r2=414800&view=diff
==============================================================================
--- incubator/activemq/site/activemq-40-release.html (original)
+++ incubator/activemq/site/activemq-40-release.html Fri Jun 16 03:37:00 2006
@@ -261,6 +261,13 @@
 <PRE class="code-java">tcp:<SPAN class="code-comment">//localhost:61616?jms.optimizeAcknowledge=<SPAN class="code-keyword">false</SPAN></SPAN></PRE>
 </DIV></DIV>
 
+<P>The source distributions do not build as is anymore due to changes in the way the maven repo is now setup at Apache.  You must first apply the following <SPAN class="nobr"><A href="activemq-40-release.data/amq4-build.patch" title="amq4-build.patch attached to ActiveMQ 4.0 Release">patch<SUP><IMG class="rendericon" src="http://goopen.org/confluence/images/icons/link_attachment_7.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN> before doing the build.  You will need to download the patch and apply it using the patch command.</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">cd ${path-to-activemq-source-distro}
+patch -p 0 &lt; ${path-to-amq4-build.patch}</PRE>
+</DIV></DIV>
+
 <H3><A name="ActiveMQ4.0Release-Whathaschanged"></A>What has changed</H3>
 
 <P>The 4.x branch of Apache ActiveMQ has now moved to the Apache Incubator so the package names have changed from org.activemq to org.apache.activemq. For a full list see the <A href="changes-in-40.html" title="Changes in 4.0">Changes in 4.0</A>.</P>
@@ -1220,8 +1227,8 @@
     </DIV>
     <DIV id="site-footer">
           Added by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A>,
-    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Jun 14, 2006
-                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=5873&originalId=8738">view change</A>)
+    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=chirino">Hiram Chirino</A> on Jun 14, 2006
+                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=5873&originalId=8746">view change</A>)
               
       (<A href="http://goopen.org/confluence/pages/editpage.action?pageId=5873">edit page</A>)
     </DIV>

Modified: incubator/activemq/site/download.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/download.html?rev=414800&r1=414799&r2=414800&view=diff
==============================================================================
--- incubator/activemq/site/download.html (original)
+++ incubator/activemq/site/download.html Fri Jun 16 03:37:00 2006
@@ -253,7 +253,8 @@
 
 <P>Other releases are available</P>
 <UL>
-	<LI><SPAN class="nobr"><A href="http://people.apache.org/repository/incubator-activemq/zips/" title="Visit page outside Confluence" rel="nofollow">Current development SNAPSHOT releases<SUP><IMG class="rendericon" src="http://goopen.org/confluence/images/icons/linkext7.gif" height="0" width="0" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI><SPAN class="nobr"><A href="http://people.apache.org/maven-snapshot-repository/incubator-activemq/incubator-activemq/" title="Visit page outside Confluence" rel="nofollow">Current Maven 2 snapshot releases<SUP><IMG class="rendericon" src="http://goopen.org/confluence/images/icons/linkext7.gif" height="0" width="0" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
+	<LI><SPAN class="nobr"><A href="http://people.apache.org/repository/incubator-activemq/zips/" title="Visit page outside Confluence" rel="nofollow">Other development SNAPSHOT releases<SUP><IMG class="rendericon" src="http://goopen.org/confluence/images/icons/linkext7.gif" height="0" width="0" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
 	<LI><SPAN class="nobr"><A href="http://people.apache.org/repository/incubator-activemq/distributions/" title="Visit page outside Confluence" rel="nofollow">Previous distributions<SUP><IMG class="rendericon" src="http://goopen.org/confluence/images/icons/linkext7.gif" height="0" width="0" align="absmiddle" alt="" border="0"></SUP></A></SPAN></LI>
 </UL>
 
@@ -338,8 +339,8 @@
     </DIV>
     <DIV id="site-footer">
           Added by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A>,
-    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Jun 14, 2006
-                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=115&originalId=8739">view change</A>)
+    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Jun 16, 2006
+                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=115&originalId=8777">view change</A>)
               
       (<A href="http://goopen.org/confluence/pages/editpage.action?pageId=115">edit page</A>)
     </DIV>

Modified: incubator/activemq/site/features.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/features.html?rev=414800&r1=414799&r2=414800&view=diff
==============================================================================
--- incubator/activemq/site/features.html (original)
+++ incubator/activemq/site/features.html Fri Jun 16 03:37:00 2006
@@ -256,7 +256,10 @@
               <a href="javascript:hideChildren()">Hide Children</a></span>
           </div>
           <div class="greybox" id="children" style="display: none;">
-                                      <a href="http://goopen.org/confluence/display/ACTIVEMQ/Security" title="Security">Security</a>
+                                      <a href="http://goopen.org/confluence/display/ACTIVEMQ/Per+Destination+Policies" title="Per Destination Policies">Per Destination Policies</a>
+              <span class="smalltext">(ActiveMQ)</span>
+              <br>
+                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/Security" title="Security">Security</a>
               <span class="smalltext">(ActiveMQ)</span>
               <br>
                           <a href="http://goopen.org/confluence/display/ACTIVEMQ/ActiveMQ+Performance+Module+Users+Manual" title="ActiveMQ Performance Module Users Manual">ActiveMQ Performance Module Users Manual</a>
@@ -296,9 +299,6 @@
               <span class="smalltext">(ActiveMQ)</span>
               <br>
                           <a href="http://goopen.org/confluence/display/ACTIVEMQ/Optimized+Acknowledgement" title="Optimized Acknowledgement">Optimized Acknowledgement</a>
-              <span class="smalltext">(ActiveMQ)</span>
-              <br>
-                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/Per+Destination+Policies" title="Per Destination Policies">Per Destination Policies</a>
               <span class="smalltext">(ActiveMQ)</span>
               <br>
                           <a href="http://goopen.org/confluence/display/ACTIVEMQ/Replicated+Message+Store" title="Replicated Message Store">Replicated Message Store</a>

Modified: incubator/activemq/site/masterslave.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/masterslave.html?rev=414800&r1=414799&r2=414800&view=diff
==============================================================================
--- incubator/activemq/site/masterslave.html (original)
+++ incubator/activemq/site/masterslave.html Fri Jun 16 03:37:00 2006
@@ -245,8 +245,8 @@
 <!--          
             <div class="pagetitle">MasterSlave</div>
 -->
-            <DIV class="wiki-content"><TABLE cellpadding="5" width="85%" cellspacing="8px" class="noteMacro" border="0" align="center"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://goopen.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B class="strong">Apache ActiveMQ 4.0 Feature</B><BR><BR>
-The Master/Slave functionality is only available in the Apache ActiveMQ 4.0 m5 release and above </TD></TR></TABLE>
+            <DIV class="wiki-content"><TABLE cellpadding="5" width="85%" cellspacing="8px" class="noteMacro" border="0" align="center"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://goopen.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B class="strong">Apache ActiveMQ 4.0 Feature</B><BR>
+<P>The Master/Slave functionality is only available in the Apache ActiveMQ 4.0 release and above</P></TD></TR></TABLE>
 
 <H3><A name="MasterSlave-Introduction"></A>Introduction</H3>
 
@@ -334,8 +334,8 @@
     </DIV>
     <DIV id="site-footer">
           Added by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=rajdavies">Rob Davies</A>,
-    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on May 12, 2006
-                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=34&originalId=5481">view change</A>)
+    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Jun 16, 2006
+                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=34&originalId=8778">view change</A>)
               
       (<A href="http://goopen.org/confluence/pages/editpage.action?pageId=34">edit page</A>)
     </DIV>

Modified: incubator/activemq/site/tomcat.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/tomcat.html?rev=414800&r1=414799&r2=414800&view=diff
==============================================================================
--- incubator/activemq/site/tomcat.html (original)
+++ incubator/activemq/site/tomcat.html Fri Jun 16 03:37:00 2006
@@ -245,8 +245,7 @@
 <!--          
             <div class="pagetitle">Tomcat</div>
 -->
-            <DIV class="wiki-content">
-<P>You should go to Tomcat documentation and read JNDI Resources HOW-TO, especially part: Configure Tomcat&apos;s Resource Factory.</P>
+            <DIV class="wiki-content"><P>You should go to Tomcat documentation and read JNDI Resources HOW-TO, especially part: Configure Tomcat&apos;s Resource Factory.</P>
 
 <P>ActiveMQ has ready JNDI resource factory for all its administered objects: ConnectionFactory and destinations.</P>
 
@@ -306,7 +305,14 @@
     ....
 &lt;/Context&gt;</PRE>
 </DIV></DIV>
-<P>&nbsp;</P></DIV>
+<P>&nbsp;</P>
+
+<TABLE cellpadding="5" width="85%" cellspacing="8px" class="infoMacro" border="0" align="center"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://goopen.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B class="strong">JMX Tip when working with Tomcat</B><BR>
+<P>If you want to use JMX with Tomcat and then connect via JConsole to view the <A href="jmx.html" title="JMX">JMX</A> MBeans of the server then set the following</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">CATALINA_OPTS=<SPAN class="code-quote">&quot;$CATALINA_OPTS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=<SPAN class="code-keyword">false</SPAN> -Dcom.sun.management.jmxremote.authenticate=<SPAN class="code-keyword">false</SPAN>&quot;</SPAN></PRE>
+</DIV></DIV></TD></TR></TABLE></DIV>
           
                   </DIV>
         </TD>
@@ -316,8 +322,8 @@
     </DIV>
     <DIV id="site-footer">
           Added by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A>,
-    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on May 12, 2006
-                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=49&originalId=5426">view change</A>)
+    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Jun 16, 2006
+                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=49&originalId=8775">view change</A>)
               
       (<A href="http://goopen.org/confluence/pages/editpage.action?pageId=49">edit page</A>)
     </DIV>