From: helge Date: Wed, 3 Aug 2005 19:24:20 +0000 (+0000) Subject: started EOCoreData library X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e4d1d94680175119881a2e96edc727aa4d8631f;p=sope started EOCoreData library git-svn-id: http://svn.opengroupware.org/SOPE/trunk@961 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/sope-appserver/samples/CoreDataBlog/ChangeLog b/sope-appserver/samples/CoreDataBlog/ChangeLog index aa7af7da..db972003 100644 --- a/sope-appserver/samples/CoreDataBlog/ChangeLog +++ b/sope-appserver/samples/CoreDataBlog/ChangeLog @@ -1,5 +1,7 @@ 2005-08-03 Helge Hess + * moved reusable objects to sope-core/EOCoreData + * added EOCoreDataSource * added classes to map EOControl objects to CoreData ones diff --git a/sope-appserver/samples/CoreDataBlog/GNUmakefile b/sope-appserver/samples/CoreDataBlog/GNUmakefile index 0b89f268..70a9d229 100644 --- a/sope-appserver/samples/CoreDataBlog/GNUmakefile +++ b/sope-appserver/samples/CoreDataBlog/GNUmakefile @@ -8,10 +8,6 @@ WOAPP_NAME = CoreDataBlog CoreDataBlog_OBJC_FILES += \ WOCoreDataApplication.m \ WOSession+CoreData.m \ - EOFetchSpecification+CoreData.m \ - EOQualifier+CoreData.m \ - EOSortOrdering+CoreData.m \ - EOCoreDataSource.m \ \ CoreDataBlog.m \ Session.m \ diff --git a/sope-core/EOCoreData/COPYING b/sope-core/EOCoreData/COPYING new file mode 100644 index 00000000..161a3d1d --- /dev/null +++ b/sope-core/EOCoreData/COPYING @@ -0,0 +1,482 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/sope-core/EOCoreData/COPYRIGHT b/sope-core/EOCoreData/COPYRIGHT new file mode 100644 index 00000000..b871ae21 --- /dev/null +++ b/sope-core/EOCoreData/COPYRIGHT @@ -0,0 +1,4 @@ +Copyright (C) 2005 SKYRIX Software AG + + +Contact: info@skyrix.com diff --git a/sope-core/EOCoreData/ChangeLog b/sope-core/EOCoreData/ChangeLog new file mode 100644 index 00000000..4339c75d --- /dev/null +++ b/sope-core/EOCoreData/ChangeLog @@ -0,0 +1,7 @@ +2005-08-03 Helge Hess + + * v4.5.1 + + * moved in implementation prototypes from CoreDataBlog + + * started EOCoreData library diff --git a/sope-core/EOCoreData/EOCoreData.h b/sope-core/EOCoreData/EOCoreData.h new file mode 100644 index 00000000..e9396be9 --- /dev/null +++ b/sope-core/EOCoreData/EOCoreData.h @@ -0,0 +1,30 @@ +/* + Copyright (C) 2005 SKYRIX Software AG + + This file is part of SOPE. + + SOPE is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + SOPE is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with SOPE; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ + +#ifndef __EOCoreData_H__ +#define __EOCoreData_H__ + +#include +#include +#include +#include + +#endif /* __EOCoreData_H__ */ diff --git a/sope-appserver/samples/CoreDataBlog/EOCoreDataSource.h b/sope-core/EOCoreData/EOCoreDataSource.h similarity index 100% rename from sope-appserver/samples/CoreDataBlog/EOCoreDataSource.h rename to sope-core/EOCoreData/EOCoreDataSource.h diff --git a/sope-appserver/samples/CoreDataBlog/EOCoreDataSource.m b/sope-core/EOCoreData/EOCoreDataSource.m similarity index 92% rename from sope-appserver/samples/CoreDataBlog/EOCoreDataSource.m rename to sope-core/EOCoreData/EOCoreDataSource.m index b3b2e3a6..8e502850 100644 --- a/sope-appserver/samples/CoreDataBlog/EOCoreDataSource.m +++ b/sope-core/EOCoreData/EOCoreDataSource.m @@ -23,6 +23,9 @@ #include "EOFetchSpecification+CoreData.h" #include "common.h" +static NSString *EODataSourceDidChangeNotification = + @"EODataSourceDidChangeNotification"; + @implementation EOCoreDataSource - (id)initWithManagedObjectContext:(NSManagedObjectContext *)_moc @@ -55,6 +58,18 @@ [super dealloc]; } +/* post datasource changes */ + +- (void)postDataSourceChangedNotification { + /* reimplemented here to avoid linking against NGExtensions */ + static NSNotificationCenter *nc = nil; + + if (nc == nil) + nc = [[NSNotificationCenter defaultCenter] retain]; + + [nc postNotificationName:EODataSourceDidChangeNotification object:self]; +} + /* fetch-spec */ - (void)setFetchSpecification:(EOFetchSpecification *)_fspec { diff --git a/sope-appserver/samples/CoreDataBlog/EOFetchSpecification+CoreData.h b/sope-core/EOCoreData/EOFetchSpecification+CoreData.h similarity index 100% rename from sope-appserver/samples/CoreDataBlog/EOFetchSpecification+CoreData.h rename to sope-core/EOCoreData/EOFetchSpecification+CoreData.h diff --git a/sope-appserver/samples/CoreDataBlog/EOFetchSpecification+CoreData.m b/sope-core/EOCoreData/EOFetchSpecification+CoreData.m similarity index 100% rename from sope-appserver/samples/CoreDataBlog/EOFetchSpecification+CoreData.m rename to sope-core/EOCoreData/EOFetchSpecification+CoreData.m diff --git a/sope-appserver/samples/CoreDataBlog/EOQualifier+CoreData.h b/sope-core/EOCoreData/EOQualifier+CoreData.h similarity index 95% rename from sope-appserver/samples/CoreDataBlog/EOQualifier+CoreData.h rename to sope-core/EOCoreData/EOQualifier+CoreData.h index b47887bc..b6700aeb 100644 --- a/sope-appserver/samples/CoreDataBlog/EOQualifier+CoreData.h +++ b/sope-core/EOCoreData/EOQualifier+CoreData.h @@ -35,6 +35,7 @@ @interface EOQualifier(CoreData) +- (id)initWithPredicate:(NSPredicate *)_predicate; - (NSPredicate *)asPredicate; @end diff --git a/sope-appserver/samples/CoreDataBlog/EOQualifier+CoreData.m b/sope-core/EOCoreData/EOQualifier+CoreData.m similarity index 81% rename from sope-appserver/samples/CoreDataBlog/EOQualifier+CoreData.m rename to sope-core/EOCoreData/EOQualifier+CoreData.m index 2b7ea032..2c76bd80 100644 --- a/sope-appserver/samples/CoreDataBlog/EOQualifier+CoreData.m +++ b/sope-core/EOCoreData/EOQualifier+CoreData.m @@ -24,9 +24,16 @@ @implementation EOQualifier(CoreData) +- (id)initWithPredicate:(NSPredicate *)_predicate { +#warning IMPLEMENT ME + NSLog(@"TODO(%s): implement me!", __PRETTY_FUNCTION__); + [self release]; + return nil; +} + - (NSPredicate *)asPredicate { #warning IMPLEMENT ME - [self logWithFormat:@"TODO: AS PREDICATE ..."]; + NSLog(@"TODO(%s): implement me!", __PRETTY_FUNCTION__); return nil; } diff --git a/sope-appserver/samples/CoreDataBlog/EOSortOrdering+CoreData.h b/sope-core/EOCoreData/EOSortOrdering+CoreData.h similarity index 95% rename from sope-appserver/samples/CoreDataBlog/EOSortOrdering+CoreData.h rename to sope-core/EOCoreData/EOSortOrdering+CoreData.h index c0aa76ea..69f18164 100644 --- a/sope-appserver/samples/CoreDataBlog/EOSortOrdering+CoreData.h +++ b/sope-core/EOCoreData/EOSortOrdering+CoreData.h @@ -35,6 +35,7 @@ @interface EOSortOrdering(CoreData) +- (id)initWithSortDescriptor:(NSSortDescriptor *)_descriptor; - (NSSortDescriptor *)asSortDescriptor; @end diff --git a/sope-appserver/samples/CoreDataBlog/EOSortOrdering+CoreData.m b/sope-core/EOCoreData/EOSortOrdering+CoreData.m similarity index 79% rename from sope-appserver/samples/CoreDataBlog/EOSortOrdering+CoreData.m rename to sope-core/EOCoreData/EOSortOrdering+CoreData.m index c52c94b4..66317599 100644 --- a/sope-appserver/samples/CoreDataBlog/EOSortOrdering+CoreData.m +++ b/sope-core/EOCoreData/EOSortOrdering+CoreData.m @@ -24,8 +24,16 @@ @implementation EOSortOrdering(CoreData) +- (id)initWithSortDescriptor:(NSSortDescriptor *)_descriptor { +#warning IMPLEMENT ME + NSLog(@"TODO(%s): implement me!", __PRETTY_FUNCTION__); + [self release]; + return nil; +} + - (NSSortDescriptor *)asSortDescriptor { - [self logWithFormat:@"TODO: AS SORT DESCRIPTOR ..."]; +#warning IMPLEMENT ME + NSLog(@"TODO(%s): implement me!", __PRETTY_FUNCTION__); return nil; } diff --git a/sope-core/EOCoreData/GNUmakefile b/sope-core/EOCoreData/GNUmakefile new file mode 100644 index 00000000..2befa5c3 --- /dev/null +++ b/sope-core/EOCoreData/GNUmakefile @@ -0,0 +1,31 @@ +# GNUstep makefile + +-include ../../config.make +include ../common.make + +LIBRARY_NAME = libEOCoreData + +libEOCoreData_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION) +libEOCoreData_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION) + +libEOCoreData_HEADER_FILES_DIR = . +libEOCoreData_HEADER_FILES_INSTALL_DIR = /EOCoreData + +libEOCoreData_HEADER_FILES = \ + EOCoreData.h \ + EOCoreDataSource.h \ + EOFetchSpecification+CoreData.h \ + EOQualifier+CoreData.h \ + EOSortOrdering+CoreData.h \ + +libEOCoreData_OBJC_FILES = \ + EOCoreDataSource.m \ + EOFetchSpecification+CoreData.m \ + EOQualifier+CoreData.m \ + EOSortOrdering+CoreData.m \ + + +-include GNUmakefile.preamble +include $(GNUSTEP_MAKEFILES)/library.make +-include GNUmakefile.postamble +-include fhs.make diff --git a/sope-core/EOCoreData/GNUmakefile.preamble b/sope-core/EOCoreData/GNUmakefile.preamble new file mode 100644 index 00000000..b3213f08 --- /dev/null +++ b/sope-core/EOCoreData/GNUmakefile.preamble @@ -0,0 +1,54 @@ +# GNUstep Makefile + +ADDITIONAL_CPP_FLAGS += -Wall -Wno-import -Wno-protocol -O2 + +libEOCoreData_INCLUDE_DIRS += -I.. + +ADDITIONAL_CPPFLAGS += -Wall -funsigned-char + +SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib + + +ifneq ($(GNUSTEP_BUILD_DIR),) +RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/.. +libEOCoreData_LIB_DIRS += \ + -L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME) +else +libEOCoreData_LIB_DIRS += \ + -L../EOControl/$(GNUSTEP_OBJ_DIR) +endif + +libEOCoreData_LIBRARIES_DEPEND_UPON += -lEOControl + + + +# libFoundation, gstep-base + +ifeq ($(FOUNDATION_LIB),fd) +libEOCoreData_LIBRARIES_DEPEND_UPON += -lFoundation +endif + +ifeq ($(FOUNDATION_LIB),gnu) +libEOCoreData_LIBRARIES_DEPEND_UPON += -lgnustep-base +endif + +# Apple + +ifeq ($(FOUNDATION_LIB),apple) + +# TODO: libEOCoreData_PREBIND_ADDR="0xC1000000" +ifneq ($(libEOCoreData_PREBIND_ADDR),) +libEOCoreData_LDFLAGS += -seg1addr $(libEOCoreData_PREBIND_ADDR) +endif + +ADDITIONAL_LDFLAGS += -framework CoreData +endif + +# Windows + +ifeq ($(GNUSTEP_TARGET_OS),mingw32) +libEOCoreData_LIBRARIES_DEPEND_UPON += -lobjc +endif +ifeq ($(GNUSTEP_TARGET_OS),cygwin32) +libEOCoreData_LIBRARIES_DEPEND_UPON += -lobjc +endif diff --git a/sope-core/EOCoreData/README.txt b/sope-core/EOCoreData/README.txt new file mode 100644 index 00000000..93e0e627 --- /dev/null +++ b/sope-core/EOCoreData/README.txt @@ -0,0 +1,6 @@ +EOCoreData +========== + +This is a library/framework which wraps the new MacOSX 10.4 in EOControl +objects. It provides various methods to convert objects between the two +environments. diff --git a/sope-core/EOCoreData/Version b/sope-core/EOCoreData/Version new file mode 100644 index 00000000..93f90d16 --- /dev/null +++ b/sope-core/EOCoreData/Version @@ -0,0 +1,3 @@ +# version file + +SUBMINOR_VERSION:=1 diff --git a/sope-core/EOCoreData/common.h b/sope-core/EOCoreData/common.h new file mode 100644 index 00000000..f0129b9c --- /dev/null +++ b/sope-core/EOCoreData/common.h @@ -0,0 +1,54 @@ +/* + Copyright (C) 2005 SKYRIX Software AG + + This file is part of SOPE. + + SOPE is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + SOPE is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with SOPE; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ + +#ifndef __EOCoreData_COMMON_H__ +#define __EOCoreData_COMMON_H__ + +#import +#import + +#include + +#import +#import +#import +#import +#import + + +#ifndef ASSIGN +# define ASSIGN(object, value) \ + ({id __object = (id)object; \ + id __value = (id)value; \ + if (__value != __object) { if (__value) [__value retain]; \ + if (__object) [__object release]; \ + object = __value;}}) +#endif +#ifndef ASSIGNCOPY +# define ASSIGNCOPY(object, value) \ + ({id __object = (id)object; \ + id __value = (id)value; \ + if (__value != __object) { if (__value) __value = [__value copy]; \ + if (__object) [__object release]; \ + object = __value;}}) +#endif + +#endif /* __EOCoreData_COMMON_H__ */ diff --git a/sope-core/EOCoreData/fhs.make b/sope-core/EOCoreData/fhs.make new file mode 100644 index 00000000..6101279e --- /dev/null +++ b/sope-core/EOCoreData/fhs.make @@ -0,0 +1,30 @@ +# postprocessing + +# FHS support (this is a hack and is going to be done by gstep-make!) + +ifneq ($(FHS_INSTALL_ROOT),) + +FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/ +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/ + +fhs-header-dirs :: + $(MKDIRS) $(FHS_INCLUDE_DIR)$(libEOCoreData_HEADER_FILES_INSTALL_DIR) + +move-headers-to-fhs :: fhs-header-dirs + @echo "moving headers to $(FHS_INCLUDE_DIR) .." + mv -f $(GNUSTEP_HEADERS)$(libEOCoreData_HEADER_FILES_INSTALL_DIR)/*.h \ + $(FHS_INCLUDE_DIR)$(libEOCoreData_HEADER_FILES_INSTALL_DIR)/ + +NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/" +NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)" + +move-libs-to-fhs :: + @echo "moving libs to $(FHS_LIB_DIR) .." + mv -f $(NONFHS_LIBDIR)/$(NONFHS_LIBNAME)* $(FHS_LIB_DIR)/ + +move-to-fhs :: move-headers-to-fhs move-libs-to-fhs + +after-install :: move-to-fhs + +endif