<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
<META NAME="Generator" CONTENT="MS Exchange Server version 6.5.7650.28">
<TITLE>RE: [ome-devel] "pre-Beta" LDAP patch</TITLE>
</HEAD>
<BODY>
<!-- Converted from text/plain format -->
<P><FONT SIZE=2>Hmm...<BR>
I just grabbed the rc3 release:<BR>
curl <A HREF="http://cvs.openmicroscopy.org.uk/snapshots/ome-2.6.0-rc3.tar.gz">http://cvs.openmicroscopy.org.uk/snapshots/ome-2.6.0-rc3.tar.gz</A> > ome-2.6.0-rc3.tar.gz<BR>
<BR>
and applied the patch:<BR>
patch -p0 <OME_2_6_0_ldap.patch<BR>
<BR>
patching file OME/install.pl<BR>
patching file OME/src/perl2/OME/Install/CoreDatabaseTablesTask.pm<BR>
Hunk #1 succeeded at 801 (offset 3 lines).<BR>
Hunk #3 succeeded at 863 (offset 3 lines).<BR>
patching file OME/src/perl2/OME/Install/Environment.pm<BR>
patching file OME/src/perl2/OME/Install/LDAPConfigTask.pm<BR>
patching file OME/src/perl2/OME/Install/PerlModuleTask.pm<BR>
Hunk #1 succeeded at 428 (offset 4 lines).<BR>
Hunk #2 succeeded at 477 (offset 2 lines).<BR>
Hunk #3 succeeded at 499 (offset 4 lines).<BR>
Hunk #4 succeeded at 734 (offset 11 lines).<BR>
patching file OME/src/perl2/OME/SessionManager.pm<BR>
Hunk #2 FAILED at 85.<BR>
Hunk #3 succeeded at 316 (offset 3 lines).<BR>
Hunk #5 succeeded at 514 (offset 82 lines).<BR>
Hunk #7 succeeded at 532 (offset 82 lines).<BR>
Hunk #9 succeeded at 613 (offset 81 lines).<BR>
1 out of 9 hunks FAILED -- saving rejects to file OME/src/perl2/OME/SessionManager.pm.rej<BR>
patching file OME/src/perl2/OME/Util/Ldap.pm<BR>
<BR>
I have one error with rc3:<BR>
<BR>
[mrmike@cisrdev OME_2_6_rc3]$ more OME/src/perl2/OME/SessionManager.pm.rej<BR>
<BR>
***************<BR>
*** 84,89 ****<BR>
use OME::Configuration;<BR>
use Term::ReadKey;<BR>
use OME::DBObject;<BR>
<BR>
use base qw(Class::Accessor Class::Data::Inheritable);<BR>
<BR>
--- 85,91 ----<BR>
use OME::Configuration;<BR>
use Term::ReadKey;<BR>
use OME::DBObject;<BR>
+ use OME::Util::Ldap;<BR>
<BR>
use base qw(Class::Accessor Class::Data::Inheritable);<BR>
<BR>
<BR>
I don't see why this is an error, but you could manually add the line:<BR>
use OME::Util::Ldap;<BR>
to SessionManager.pm and give it a whirl.<BR>
<BR>
I'll take a look at what's up with the patch later this weekend.<BR>
<BR>
<BR>
Michael J. McCaughey, PhD<BR>
Molecular Physiology and Biophysics<BR>
U9203 MRBIII<BR>
6-6175<BR>
<BR>
<BR>
<BR>
-----Original Message-----<BR>
From: ome-devel-bounces@lists.openmicroscopy.org.uk on behalf of Zhou, Mi<BR>
Sent: Fri 8/25/2006 4:26 PM<BR>
To: ome-devel@lists.openmicroscopy.org.uk<BR>
Subject: [ome-devel] "pre-Beta" LDAP patch<BR>
<BR>
Hi,<BR>
<BR>
Thank you very much for your effort in making OME "LDAP" friendly.<BR>
I am trying to apply the patch to 2.6.0-rc3 and 2.6.0-rc1, but many<BR>
hunks failed on both of them. Probably you run diff against some other<BR>
release?<BR>
<BR>
Thanks,<BR>
<BR>
Mi Zhou<BR>
St. Jude Childrent's Research Hospital<BR>
<BR>
<BR>
_______________________________________________<BR>
ome-devel mailing list<BR>
ome-devel@lists.openmicroscopy.org.uk<BR>
<A HREF="http://lists.openmicroscopy.org.uk/mailman/listinfo/ome-devel">http://lists.openmicroscopy.org.uk/mailman/listinfo/ome-devel</A><BR>
<BR>
</FONT>
</P>
</BODY>
</HTML>