<p>You can just merge 2.2 into develop can't you? Somehow this has to end up in develop, yes. Don't know if reverting 2.2 make much sense.<br /><br /></p>
<p>.On Wed, 27 Nov 2013 09:48:54 +0000 Julian Tenney <Julian.Tenney@nottingham.ac.uk> wrote</p>
<div style="padding-left: 10px; border-left: solid 2px #0000FF;">
<div class="WordSection1">
<p><span style="font-size: 11pt; font-family: Calibri, 'sans-serif'; color: #1f497d;">Just to keep things tidy, what’s the best thing to do then? Revert the 2.2 branch and then commit these to develop?</span></p>
<p> </p>
<div>
<div style="border: none; border-top: solid #B5C4DF 1pt; padding: 3pt 0cm 0cm 0cm;">
<p><strong><span style="font-size: 10pt; font-family: Tahoma, 'sans-serif';" lang="en-us" xml:lang="en-us">From:</span></strong><span style="font-size: 10pt; font-family: Tahoma, 'sans-serif';" lang="en-us" xml:lang="en-us"> xerte-dev-bounces@lists.nottingham.ac.uk [mailto:xerte-dev-bounces@lists.nottingham.ac.uk] <strong>On Behalf Of </strong>Julian Tenney<br /><strong>Sent:</strong> 27 November 2013 09:33<br /><strong>To:</strong> For Xerte technical developers<br /><strong>Subject:</strong> [Xerte-dev] Re: Fwd: Two LDAPs</span></p>
</div>
</div>
<p> </p>
<p><span style="font-size: 11pt; font-family: Calibri, 'sans-serif'; color: #1f497d;">I think I’m confusing developing in develop with developing in 2.2. So changes should go into develop? I think.</span></p>
<p> </p>
<p><span style="font-size: 11pt; font-family: Calibri, 'sans-serif'; color: #1f497d;">Anyway, as you say, let’s try and test it, and a test server would be really handy ;-)</span></p>
<p> </p>
<div>
<div style="border: none; border-top: solid #B5C4DF 1pt; padding: 3pt 0cm 0cm 0cm;">
<p><strong><span style="font-size: 10pt; font-family: Tahoma, 'sans-serif';" lang="en-us" xml:lang="en-us">From:</span></strong><span style="font-size: 10pt; font-family: Tahoma, 'sans-serif';" lang="en-us" xml:lang="en-us"> <a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a> [<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">mailto:xerte-dev-bounces@lists.nottingham.ac.uk</a>] <strong>On Behalf Of </strong>Tom Reijnders<br /><strong>Sent:</strong> 27 November 2013 09:28<br /><strong>To:</strong> For Xerte technical developers<br /><strong>Subject:</strong> [Xerte-dev] Re: Fwd: Two LDAPs</span></p>
</div>
</div>
<p> </p>
<p><span>Yes, but 2.2 is supposed to be a release branch....<br /><br />Anyhow, let's try to test this asap.</span></p>
<div>
<p><span>Julian Tenney <<a href="mailto:Julian.Tenney@nottingham.ac.uk">Julian.Tenney@nottingham.ac.uk</a>> schreef:</span></p>
<p>Because of Pat’s uncertainty that it works, so it needs testing. A hotfix should, well, fix something…</p>
<p> </p>
<div>
<div style="border: none; border-top: solid #B5C4DF 1pt; padding: 3pt 0cm 0cm 0cm;">
<p><strong><span lang="en-us" xml:lang="en-us">From:</span></strong><span lang="en-us" xml:lang="en-us"> <a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a> [<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">mailto:xerte-dev-bounces@lists.nottingham.ac.uk</a>] <strong>On Behalf Of </strong>Tom Reijnders<br /><strong>Sent:</strong> 26 November 2013 23:52<br /><strong>To:</strong> For Xerte technical developers<br /><strong>Subject:</strong> [Xerte-dev] Re: Fwd: Two LDAPs</span></p>
</div>
</div>
<p> </p>
<p>Why in the 2.2 branch? I would think either in a hotfix branch (if you want to include it in 2.1) or in develop.<br /><br />Tom</p>
<div>
<p>Julian Tenney schreef op 26-11-2013 16:15:</p>
</div>
<blockquote style="margin-top: 5pt; margin-bottom: 5pt;">
<p>I will create a 2.2 branch from develop and commit these files to it,</p>
<p> </p>
<p>Thanks,</p>
<p> </p>
<p><strong><span lang="en-us" xml:lang="en-us">From:</span></strong><span lang="en-us" xml:lang="en-us"> <a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a> [<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">mailto:xerte-dev-bounces@lists.nottingham.ac.uk</a>] <strong>On Behalf Of </strong>Pat @ Pgogy<br /><strong>Sent:</strong> 26 November 2013 15:07<br /><strong>To:</strong> For Xerte technical developers<br /><strong>Subject:</strong> [Xerte-dev] Re: Fwd: Two LDAPs</span></p>
<p> </p>
<div>
<p>I think adding this to library/xerte/authentication fixes it</p>
</div>
<div>
<p> </p>
<div>
<p>On Tue, Nov 26, 2013 at 2:10 PM, Julian Tenney <<a href="mailto:Julian.Tenney@nottingham.ac.uk">Julian.Tenney@nottingham.ac.uk</a>> wrote:</p>
<div>
<div>
<p>Sounds like Thomas can help?</p>
<p> </p>
<p><strong><span lang="en-us" xml:lang="en-us">From:</span></strong><span lang="en-us" xml:lang="en-us"> <a href="mailto:patrick.lockley@googlemail.com">patrick.lockley@googlemail.com</a> [mailto:<a href="mailto:patrick.lockley@googlemail.com">patrick.lockley@googlemail.com</a>] <strong>On Behalf Of </strong>Pat @ Pgogy<br /><strong>Sent:</strong> 26 November 2013 13:59<br /><strong>To:</strong> Julian Tenney<br /><strong>Cc:</strong> <a href="mailto:xerte@pgogywebstuff.com">xerte@pgogywebstuff.com</a>; For Xerte technical developers<br /><strong>Subject:</strong> Re: [Xerte-dev] Re: Fwd: Two LDAPs</span></p>
<div>
<div>
<p> </p>
<div>
<p>i assume it stopped working when the LDAP library was created</p>
</div>
<div>
<p> </p>
<div>
<p>On Tue, Nov 26, 2013 at 1:07 PM, Julian Tenney <<a href="mailto:Julian.Tenney@nottingham.ac.uk">Julian.Tenney@nottingham.ac.uk</a>> wrote:</p>
<div>
<div>
<p>Did it work previously?</p>
<p> </p>
<p><strong><span lang="en-us" xml:lang="en-us">From:</span></strong><span lang="en-us" xml:lang="en-us"> <a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a> [mailto:<a href="mailto:xerte-dev-bounces@lists.nottingham.ac.uk">xerte-dev-bounces@lists.nottingham.ac.uk</a>] <strong>On Behalf Of </strong>Pat @ Pgogy<br /><strong>Sent:</strong> 26 November 2013 12:00</span></p>
<div>
<p><br /><strong>To:</strong> For Xerte technical developers</p>
</div>
<p><strong>Subject:</strong> [Xerte-dev] Re: Fwd: Two LDAPs</p>
<div>
<div>
<p> </p>
<div>
<p>As far as I can tell at present, the 2.1 code as it won't work with more than one LDAP, but I have no possibility of testing</p>
<div>
<p> </p>
</div>
<div>
<p>(for ref spent ages yesterday fixing Adam Marjon's LDAP - mostly off list)</p>
</div>
</div>
<div>
<p> </p>
<div>
<p>On Tue, Nov 26, 2013 at 11:08 AM, <<a href="mailto:thomas.rochford@jiscadvance.ac.uk">thomas.rochford@jiscadvance.ac.uk</a>> wrote:</p>
<div>
<div>
<div>
<p>Hi Pat,</p>
</div>
<div>
<p> </p>
</div>
<div>
<p>Yes indeed. I’ve had big problems at Lowestoft college where they have three LDAPS! One for IT Staff, another for All other staff and the third for students. Quite a few colleges have separate domains for staff and students as well.</p>
</div>
<div>
<div>
<p> </p>
</div>
<div>
<p>Kindest Regards,<br />Thomas<br />==========================================================<br />Thomas Rochford | e-Learning Advisor | Jisc RSC Eastern<br />Tel: 01223 564749 | Mobile: 07500 669002 | Skype: cambridge.serendipity<br />Email: <a href="mailto:thomas.rochford@jiscadvance.ac.uk">thomas.rochford@jiscadvance.ac.uk</a> | Web: <a href="http://www.jiscrsc.ac.uk/eastern">http://www.jiscrsc.ac.uk/eastern</a> <br />Cambridge Serendipity, 35 Gough Way, Cambridge, CB3 9LN<br />For the full range of RSC UK events, resources and blog, visit <a href="http://www.jiscrsc.ac.uk">http://www.jiscrsc.ac.uk</a></p>
</div>
<div>
<p> </p>
</div>
</div>
<div style="border: none; border-top: solid #E5E5E5 1pt; padding: 4pt 0cm 0cm 0cm;">
<div>
<p><strong>From:</strong> <a href="mailto:xerte@pgogywebstuff.com">Pat @ Pgogy</a><br /><strong>Sent:</strong> Monday, 25 November 2013 15:57<br /><strong>To:</strong> <a href="mailto:xerte-dev@lists.nottingham.ac.uk">For Xerte technical developers</a></p>
</div>
</div>
<div>
<div>
<div>
<p> </p>
</div>
<div>
<div>
<div>
<div>
<div>
<p>hello </p>
</div>
<div>
<p> </p>
</div>
<div>
<p>Is anyone auth'ing to two LDAPs?</p>
</div>
<div>
<p> </p>
</div>
<div>
<p>I think I've found a bug, but need to test</p>
</div>
<div>
<p> </p>
</div>
<div>
<p>Pat</p>
</div>
</div>
</div>
<p> </p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<p> </p>
</div>
</div>
</div>
</div>
<p> </p>
<p>This message and any attachment are intended solely for the addressee and may contain confidential information. If you have received this message in error, please send it back to me, and immediately delete it. Please do not use, copy or disclose the information contained in this message or in any attachment. Any views or opinions expressed by the author of this email do not necessarily reflect the views of the University of Nottingham.</p>
<p>This message has been checked for viruses but the contents of an attachment may still contain software viruses which could damage your computer system, you are advised to perform your own checks. Email communications with the University of Nottingham may be monitored as permitted by UK legislation.</p>
<p> </p>
</div>
</div>
<p> </p>
</div>
</div>
</div>
</div>
</div>
<div>
<div>
<p> </p>
<p>This message and any attachment are intended solely for the addressee and may contain confidential information. If you have received this message in error, please send it back to me, and immediately delete it. Please do not use, copy or disclose the information contained in this message or in any attachment. Any views or opinions expressed by the author of this email do not necessarily reflect the views of the University of Nottingham.</p>
<p>This message has been checked for viruses but the contents of an attachment may still contain software viruses which could damage your computer system, you are advised to perform your own checks. Email communications with the University of Nottingham may be monitored as permitted by UK legislation.</p>
<p> </p>
</div>
</div>
</div>
<p> </p>
</div>
<p> </p>
<p>This message and any attachment are intended solely for the addressee and may contain confidential information. If you have received this message in error, please send it back to me, and immediately delete it. Please do not use, copy or disclose the information contained in this message or i n any attachment. Any views or opinions expressed by the author of this email do not necessarily reflect the views of the University of Nottingham.</p>
<p>This message has been checked for viruses but the contents of an attachment may still contain software viruses which could damage your computer system, you are advised to perform your own checks. Email communications with the University of Nottingham may be monitored as permitted by UK legislation.</p>
<p><br /><br /></p>
<pre>_______________________________________________</pre>
<pre>Xerte-dev mailing list</pre>
<pre><a href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a></pre>
<pre><a href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a></pre>
</blockquote>
<p> </p>
<pre>--</pre>
<pre>--</pre>
<p> </p>
<pre>Tom Reijnders</pre>
<pre>TOR Informatica</pre>
<pre>Chopinlaan 27</pre>
<pre>5242HM Rosmalen</pre>
<pre>Tel: 073 5226191</pre>
<pre>Fax: 073 5226196</pre>
<p> </p>
<p> </p>
<p>This message and any attachment are intended solely for the addressee and may contain confidential information. If you have received this message in error, please send it back to me, and immediately delete it. Please do not use, copy or disclose the information contained in this message or in any attachment. Any views or opinions expressed by the author of this email do not necessarily reflect the views of the University of Nottingham.</p>
<p>This message has been checked for viruses but the contents of an attachment may still contain software viruses which could damage your computer system, you are advised to perform your own checks. Email communications with the University of Nottingham may be monitored as permitted by UK legislation.</p>
<p> </p>
<pre style="text-align: center;"> </pre>
<pre><br />Xerte-dev mailing list<br /><a href="mailto:Xerte-dev@lists.nottingham.ac.uk">Xerte-dev@lists.nottingham.ac.uk</a><br /><a href="http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev">http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev</a></pre>
</div>
<p><span><br />-- <br />Verzonden van mijn Android telefoon met K-9 Mail.</span></p>
</div>
</div>