site: developers.html source.html

jstrachan Mon, 12 Jun 2006 03:29:49 -0700

Author: jstrachan
Date: Mon Jun 12 03:29:27 2006
New Revision: 413625

URL: http://svn.apache.org/viewvc?rev=413625&view=rev
Log:
Latest export from confluence


Modified:
    incubator/activemq/site/developers.html
    incubator/activemq/site/source.html

Modified: incubator/activemq/site/developers.html
URL: 
http://svn.apache.org/viewvc/incubator/activemq/site/developers.html?rev=413625&r1=413624&r2=413625&view=diff
==============================================================================
--- incubator/activemq/site/developers.html (original)
+++ incubator/activemq/site/developers.html Mon Jun 12 03:29:27 2006
@@ -157,6 +157,7 @@
        <LI><A href="visualisation.html" 
title="Visualisation">Visualisation</A></LI>
        <LI><A href="kaha-persistence.html" title="Kaha Persistence">Kaha 
Persistence</A></LI>
        <LI><A href="async-sends.html" title="Async Sends">Async Sends</A></LI>
+       <LI><A href="jmsxuserid.html" title="JMSXUserID">JMSXUserID</A></LI>
        <LI><A href="changes-in-40.html" title="Changes in 4.0">Other new 
features</A></LI>
 </UL>
 
@@ -217,6 +218,7 @@
        <LI><A href="wire-protocol.html" title="Wire Protocol">Wire 
Protocol</A></LI>
        <LI><A href="developer-guide.html" title="Developer Guide">Developer 
Guide</A></LI>
        <LI><A href="becoming-a-committer.html" title="Becoming a 
committer">Becoming a committer</A></LI>
+       <LI><SPAN class="nobr"><A href="http://ci.gbuild.org/continuum/"; 
title="Visit page outside Confluence" rel="nofollow">GBuild<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><A href="integration-tests.html" title="Integration 
Tests">Integration Tests</A></LI>
        <LI><A href="activemq-performance-module-users-manual.html" 
title="ActiveMQ Performance Module Users Manual">Maven2 Performance 
Plugin</A></LI>
        <LI><A href="benchmark-tests.html" title="Benchmark Tests">Benchmark 
Tests</A></LI>

Modified: incubator/activemq/site/source.html
URL: 
http://svn.apache.org/viewvc/incubator/activemq/site/source.html?rev=413625&r1=413624&r2=413625&view=diff
==============================================================================
--- incubator/activemq/site/source.html (original)
+++ incubator/activemq/site/source.html Mon Jun 12 03:29:27 2006
@@ -157,6 +157,7 @@
        <LI><A href="visualisation.html" 
title="Visualisation">Visualisation</A></LI>
        <LI><A href="kaha-persistence.html" title="Kaha Persistence">Kaha 
Persistence</A></LI>
        <LI><A href="async-sends.html" title="Async Sends">Async Sends</A></LI>
+       <LI><A href="jmsxuserid.html" title="JMSXUserID">JMSXUserID</A></LI>
        <LI><A href="changes-in-40.html" title="Changes in 4.0">Other new 
features</A></LI>
 </UL>
 
@@ -217,6 +218,7 @@
        <LI><A href="wire-protocol.html" title="Wire Protocol">Wire 
Protocol</A></LI>
        <LI><A href="developer-guide.html" title="Developer Guide">Developer 
Guide</A></LI>
        <LI><A href="becoming-a-committer.html" title="Becoming a 
committer">Becoming a committer</A></LI>
+       <LI><SPAN class="nobr"><A href="http://ci.gbuild.org/continuum/"; 
title="Visit page outside Confluence" rel="nofollow">GBuild<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><A href="integration-tests.html" title="Integration 
Tests">Integration Tests</A></LI>
        <LI><A href="activemq-performance-module-users-manual.html" 
title="ActiveMQ Performance Module Users Manual">Maven2 Performance 
Plugin</A></LI>
        <LI><A href="benchmark-tests.html" title="Benchmark Tests">Benchmark 
Tests</A></LI>
@@ -242,8 +244,7 @@
 <!--          
             <div class="pagetitle">Source</div>
 -->
-            <DIV class="wiki-content">
-<H2><A name="Source-WebBrowsingofSVN"></A>Web Browsing of SVN</H2>
+            <DIV class="wiki-content"><H2><A 
name="Source-WebBrowsingofSVN"></A>Web Browsing of SVN</H2>
 
 <P>To browse CVS via the web use the CVSWeb interface</P>
 
@@ -257,8 +258,37 @@
 
 <P>Only project developers can commit to the SVN tree via this method.  SSH 
must be installed on your client machine. Enter your site password when 
prompted.</P>
 
+<H3><A name="Source-Branches"></A>Branches</H3>
+
+<P>We use the trunk for the next main release of ActiveMQ; then we use a 
branch for any bug fixes on the previous major release. So at the time of 
writing the stable production version of ActiveMQ is 4.0 so the branch is 
here</P>
+
+<P><SPAN class="nobr"><A 
href="https://svn.apache.org/repos/asf/incubator/activemq/branches/activemq-4.0/";
 title="Visit page outside Confluence" 
rel="nofollow">https://svn.apache.org/repos/asf/incubator/activemq/branches/activemq-4.0/<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></P>
+
+<P>and trunk is 4.1-SNAPSHOT</P>
+
+<H3><A name="Source-Backportingbugfixes"></A>Backporting bug fixes</H3>
+
+<P>Developers typically work on trunk most of the time. When bug fixes are 
applied you typically want to backport them to the previous branch. To be able 
to backport to the previous production branch follow these instructions.</P>
+
+<UL>
+       <LI>checkout trunk as above</LI>
+       <LI>checkout the previous branch such as via <DIV class="code"><DIV 
class="codeContent">
+<PRE class="code-java">svn co https:<SPAN 
class="code-comment">//svn.apache.org/repos/asf/incubator/activemq/branches/activemq-4.0/</SPAN></PRE>
+</DIV></DIV></LI>
+       <LI>when you have commit something to trunk take note of the version 
number of the change (lets call it Y)</LI>
+       <LI>in the branch checkout type the following command <DIV 
class="code"><DIV class="codeContent">
+<PRE class="code-java">svn merge -r X:Y https:<SPAN 
class="code-comment">//svn.apache.org/repos/asf/incubator/activemq/trunk/</SPAN></PRE>
+</DIV></DIV> where X = Y-1</LI>
+</UL>
+
+
+<P>e.g.</P>
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">svn merge -r 411787:411788 https:<SPAN 
class="code-comment">//svn.apache.org/repos/asf/incubator/activemq/trunk/</SPAN></PRE>
+</DIV></DIV>
 
 <H3><A 
name="Source-ToworkwiththeActiveMQ3.xbranchofActiveMQthenusethefollowing"></A>To
 work with the ActiveMQ 3.x branch of ActiveMQ then use the following</H3>
+
 <P>For anonymous access</P>
 
 <DIV class="code"><DIV class="codeContent">
@@ -283,8 +313,8 @@
     </DIV>
     <DIV id="site-footer">
           Added by     <A 
href="http://goopen.org/confluence/users/viewuserprofile.action?username=chirino";>Hiram
 Chirino</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=160&originalId=5378";>view
 change</A>)
+    last edited by     <A 
href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan";>James
 Strachan</A> on Jun 12, 2006
+                  &nbsp;(<A 
href="http://goopen.org/confluence/pages/diffpages.action?pageId=160&originalId=8701";>view
 change</A>)
               
       (<A 
href="http://goopen.org/confluence/pages/editpage.action?pageId=160";>edit 
page</A>)
     </DIV>

svn commit: r413625 - in /incubator/activemq/site: developers.html source.html

Reply via email to