diff --git a/buildout/mysql-tritonn-5.0/src/mysql_hooks.py b/buildout/hooks/mysql-tritonn-hooks.py
similarity index 100%
rename from buildout/mysql-tritonn-5.0/src/mysql_hooks.py
rename to buildout/hooks/mysql-tritonn-hooks.py
diff --git a/buildout/mysql-instance/buildout.cfg b/buildout/instance-profiles/mysql.cfg
similarity index 85%
rename from buildout/mysql-instance/buildout.cfg
rename to buildout/instance-profiles/mysql.cfg
index ef1b0913a93a23270e3a5960208e15cb66fec138..8d1aee7f904a50333978f0ffa9a3ce7e62f6ce76 100644
--- a/buildout/mysql-instance/buildout.cfg
+++ b/buildout/instance-profiles/mysql.cfg
@@ -17,22 +17,22 @@ mysql_cnf_file = ${buildout:etc-directory}/my.cnf
[mysql-bin]
recipe = collective.recipe.template
-input = ${buildout:directory}/mysql-instance/templates/mysql.in
+input = ${buildout:directory}/templates/mysql.in
output = ${buildout:data-bin-directory}/mysql
[mysql-admin]
recipe = collective.recipe.template
-input = ${buildout:directory}/mysql-instance/templates/mysqladmin.in
+input = ${buildout:directory}/templates/mysqladmin.in
output = ${buildout:data-bin-directory}/mysqladmin
[mysqld_safe-bin]
recipe = collective.recipe.template
-input = ${buildout:directory}/mysql-instance/templates/mysqld_safe.in
+input = ${buildout:directory}/templates/mysqld_safe.in
output = ${buildout:data-bin-directory}/mysqld_safe
[mysql-cnf]
recipe = collective.recipe.template
-input = ${buildout:directory}/mysql-instance/templates/my.cnf.in
+input = ${buildout:directory}/templates/my.cnf.in
output = ${configuration:mysql_cnf_file}
[mysql-instance]
diff --git a/buildout/oood-instance/buildout.cfg b/buildout/instance-profiles/oood.cfg
similarity index 100%
rename from buildout/oood-instance/buildout.cfg
rename to buildout/instance-profiles/oood.cfg
diff --git a/buildout/zeo-instance/buildout.cfg b/buildout/instance-profiles/zeo.cfg
similarity index 100%
rename from buildout/zeo-instance/buildout.cfg
rename to buildout/instance-profiles/zeo.cfg
diff --git a/buildout/zope-instance/buildout.cfg b/buildout/instance-profiles/zope.cfg
similarity index 100%
rename from buildout/zope-instance/buildout.cfg
rename to buildout/instance-profiles/zope.cfg
diff --git a/buildout/minimal.cfg b/buildout/minimal.cfg
index f75e8dc046711a4010284bac07c81b06de3a7b3c..dc9855956ac213212a2200048f47b71b6dde13b4 100644
--- a/buildout/minimal.cfg
+++ b/buildout/minimal.cfg
@@ -1,8 +1,8 @@
[buildout]
extends =
profiles/versions.cfg
- erp5-software/buildout.cfg
- zope-instance/buildout.cfg
+ software-profiles/erp5.cfg
+ instance-profiles/zope.cfg
parts =
cmf15
diff --git a/buildout/mysql-instance/LICENSE.GPL b/buildout/mysql-instance/LICENSE.GPL
deleted file mode 100644
index ba9543b0febaf92a3dff13f4f6b6267eff26e4f0..0000000000000000000000000000000000000000
--- a/buildout/mysql-instance/LICENSE.GPL
+++ /dev/null
@@ -1,222 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-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 give any other recipients of the Program a copy of this License
-along with the Program.
-
-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 Program or any portion
-of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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 Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) 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; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, 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 executable. 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.
-
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
-
- 5. 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 Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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.
-
- 7. 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 Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
-
-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.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the 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 Program
-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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
diff --git a/buildout/mysql-instance/README.txt b/buildout/mysql-instance/README.txt
deleted file mode 100644
index 33ef15b9ba747b58aebb9f3f4658f2f7c1ef31db..0000000000000000000000000000000000000000
--- a/buildout/mysql-instance/README.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Introduction
-============
-
-This is a buildout to create instance for MySQL Tritonn
-
-Usage
-=======
-
-Afterwards, type:
- $ bin/supervisord -e debug -n
-
-If everything looks good:
- $ bin/supervisord
-
-
-Configure
-=========
-
-You can change the default ports by editing buildout.cfg:
-
- [ports]
- 鈥�
- supervisor = 9001
- mysql = 3306
-
-Then rerun buildout:
- $ bin/buildout
diff --git a/buildout/mysql-tritonn-5.0/LICENSE.GPL b/buildout/mysql-tritonn-5.0/LICENSE.GPL
deleted file mode 100644
index ba9543b0febaf92a3dff13f4f6b6267eff26e4f0..0000000000000000000000000000000000000000
--- a/buildout/mysql-tritonn-5.0/LICENSE.GPL
+++ /dev/null
@@ -1,222 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-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 give any other recipients of the Program a copy of this License
-along with the Program.
-
-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 Program or any portion
-of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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 Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) 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; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, 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 executable. 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.
-
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
-
- 5. 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 Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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.
-
- 7. 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 Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
-
-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.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the 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 Program
-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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
diff --git a/buildout/mysql-tritonn-5.0/README.txt b/buildout/mysql-tritonn-5.0/README.txt
deleted file mode 100644
index 6f1a5d4c9d1a349e064870041b9795b8eb93ed56..0000000000000000000000000000000000000000
--- a/buildout/mysql-tritonn-5.0/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Introduction
-============
-
-This is a buildout to compile MySQL with Senna
diff --git a/buildout/official.cfg b/buildout/official.cfg
index eb95423d391b4ff3af6eb0cd4cc8fb3ba3d42e9d..08d186f1a597ed17b134935981e2c6e687f9dea2 100644
--- a/buildout/official.cfg
+++ b/buildout/official.cfg
@@ -1,18 +1,16 @@
[buildout]
extends =
profiles/versions.cfg
- apache/buildout.cfg
- erp5-software/buildout.cfg
- haproxy/buildout.cfg
- mysql-tritonn-5.0/buildout.cfg
- mysql-instance/buildout.cfg
- oood/buildout.cfg
- imagemagick/buildout.cfg
- openoffice-bin/buildout.cfg
- python-2.4/buildout.cfg
- varnish/buildout.cfg
- zope-2.8/buildout.cfg
- zope-instance/buildout.cfg
+ software-profiles/apache.cfg
+ software-profiles/erp5.cfg
+ software-profiles/haproxy.cfg
+ software-profiles/mysql-tritonn-5.0.cfg
+ software-profiles/openoffice-bin.cfg
+ software-profiles/oood.cfg
+ software-profiles/imagemagick.cfg
+ software-profiles/python-2.4.cfg
+ software-profiles/varnish.cfg
+ software-profiles/zope-2.8.cfg
var-directory = ${:directory}/var
etc-directory = ${:var-directory}/etc
diff --git a/buildout/apache/buildout.cfg b/buildout/software-profiles/apache.cfg
similarity index 100%
rename from buildout/apache/buildout.cfg
rename to buildout/software-profiles/apache.cfg
diff --git a/buildout/erp5-software/buildout.cfg b/buildout/software-profiles/erp5.cfg
similarity index 100%
rename from buildout/erp5-software/buildout.cfg
rename to buildout/software-profiles/erp5.cfg
diff --git a/buildout/haproxy/buildout.cfg b/buildout/software-profiles/haproxy.cfg
similarity index 100%
rename from buildout/haproxy/buildout.cfg
rename to buildout/software-profiles/haproxy.cfg
diff --git a/buildout/imagemagick/buildout.cfg b/buildout/software-profiles/imagemagick.cfg
similarity index 100%
rename from buildout/imagemagick/buildout.cfg
rename to buildout/software-profiles/imagemagick.cfg
diff --git a/buildout/mysql-tritonn-5.0/buildout.cfg b/buildout/software-profiles/mysql-tritonn-5.0.cfg
similarity index 88%
rename from buildout/mysql-tritonn-5.0/buildout.cfg
rename to buildout/software-profiles/mysql-tritonn-5.0.cfg
index a91be45583d38a55e8e6ed976705294e11181c43..783bc99ea4ea06c3305245f58e05249d713d89ac 100644
--- a/buildout/mysql-tritonn-5.0/buildout.cfg
+++ b/buildout/software-profiles/mysql-tritonn-5.0.cfg
@@ -22,8 +22,8 @@ download-only = true
[mysql-tritonn-5.0]
recipe = hexagonit.recipe.cmmi
url = http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.87.tar.gz
-pre-configure-hook = ${buildout:directory}/mysql-tritonn-5.0/src/mysql_hooks.py:pre_configure_hook
-post-make-hook = ${buildout:directory}/mysql-tritonn-5.0/src/mysql_hooks.py:post_make_hook
+pre-configure-hook = ${buildout:directory}/hooks/mysql-tritonn-hooks.py:pre_configure_hook
+post-make-hook = ${buildout:directory}/hooks/mysql-tritonn-hooks.py:post_make_hook
# configure: how to avoid searching for my.cnf?
# - like in mysql part in http://svn.zope.org/zodbshootout/trunk/buildout.cfg?view=markup
configure-options =
diff --git a/buildout/oood/buildout.cfg b/buildout/software-profiles/oood.cfg
similarity index 100%
rename from buildout/oood/buildout.cfg
rename to buildout/software-profiles/oood.cfg
diff --git a/buildout/openoffice-bin/buildout.cfg b/buildout/software-profiles/openoffice-bin.cfg
similarity index 100%
rename from buildout/openoffice-bin/buildout.cfg
rename to buildout/software-profiles/openoffice-bin.cfg
diff --git a/buildout/openoffice/buildout.cfg b/buildout/software-profiles/openoffice.cfg
similarity index 100%
rename from buildout/openoffice/buildout.cfg
rename to buildout/software-profiles/openoffice.cfg
diff --git a/buildout/python-2.4/buildout.cfg b/buildout/software-profiles/python-2.4.cfg
similarity index 100%
rename from buildout/python-2.4/buildout.cfg
rename to buildout/software-profiles/python-2.4.cfg
diff --git a/buildout/python-2.6/buildout.cfg b/buildout/software-profiles/python-2.6.cfg
similarity index 100%
rename from buildout/python-2.6/buildout.cfg
rename to buildout/software-profiles/python-2.6.cfg
diff --git a/buildout/supervisor/buildout.cfg b/buildout/software-profiles/supervisor.cfg
similarity index 100%
rename from buildout/supervisor/buildout.cfg
rename to buildout/software-profiles/supervisor.cfg
diff --git a/buildout/varnish/buildout.cfg b/buildout/software-profiles/varnish.cfg
similarity index 100%
rename from buildout/varnish/buildout.cfg
rename to buildout/software-profiles/varnish.cfg
diff --git a/buildout/zope-2.12/buildout.cfg b/buildout/software-profiles/zope-2.12.cfg
similarity index 100%
rename from buildout/zope-2.12/buildout.cfg
rename to buildout/software-profiles/zope-2.12.cfg
diff --git a/buildout/zope-2.8/buildout.cfg b/buildout/software-profiles/zope-2.8.cfg
similarity index 100%
rename from buildout/zope-2.8/buildout.cfg
rename to buildout/software-profiles/zope-2.8.cfg
diff --git a/buildout/mysql-instance/templates/my.cnf.in b/buildout/templates/my.cnf.in
similarity index 100%
rename from buildout/mysql-instance/templates/my.cnf.in
rename to buildout/templates/my.cnf.in
diff --git a/buildout/mysql-instance/templates/mysql.in b/buildout/templates/mysql.in
similarity index 100%
rename from buildout/mysql-instance/templates/mysql.in
rename to buildout/templates/mysql.in
diff --git a/buildout/mysql-instance/templates/mysqladmin.in b/buildout/templates/mysqladmin.in
similarity index 100%
rename from buildout/mysql-instance/templates/mysqladmin.in
rename to buildout/templates/mysqladmin.in
diff --git a/buildout/mysql-instance/templates/mysqld_safe.in b/buildout/templates/mysqld_safe.in
similarity index 100%
rename from buildout/mysql-instance/templates/mysqld_safe.in
rename to buildout/templates/mysqld_safe.in
diff --git a/buildout/zope-2.8/patches/Zope-2.8.0-final-aq_dynamic.patch b/buildout/zope-2.8/patches/Zope-2.8.0-final-aq_dynamic.patch
deleted file mode 100644
index 7a0426112ab21d4282a52ecfd0635815d8ada401..0000000000000000000000000000000000000000
--- a/buildout/zope-2.8/patches/Zope-2.8.0-final-aq_dynamic.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -urN Zope-2.8.0-final.orig/lib/python/Acquisition/_Acquisition.c Zope-2.8.0-final/lib/python/Acquisition/_Acquisition.c
---- Zope-2.8.0-final.orig/lib/python/Acquisition/_Acquisition.c 2005-06-11 08:24:02.000000000 +0200
-+++ Zope-2.8.0-final/lib/python/Acquisition/_Acquisition.c 2005-06-17 16:26:00.742556205 +0200
-@@ -410,6 +410,64 @@
- int explicit, int containment);
-
- static PyObject *
-+Wrapper_GetAttr(PyObject *self, PyObject *attr_name, PyObject *orig)
-+{
-+ /* This function retrieves an attribute from an object by PyObject_GetAttr.
-+
-+ The main difference between Wrapper_GetAttr and PyObject_GetAttr is that
-+ Wrapper_GetAttr calls _aq_dynamic to generate an attribute dynamically, if
-+ the attribute is not found.
-+ */
-+ PyObject *r, *v, *tb;
-+ PyObject *d, *m;
-+ PyObject *o;
-+
-+ if (isWrapper (self))
-+ o = WRAPPER(self)->obj;
-+ else
-+ o = self;
-+
-+ /* Try to get an attribute in the normal way first. */
-+ r = PyObject_GetAttr(o, attr_name);
-+ if (r)
-+ return r;
-+
-+ /* If an unexpected error happens, return immediately. */
-+ PyErr_Fetch(&r,&v,&tb);
-+ if (r != PyExc_AttributeError)
-+ {
-+ PyErr_Restore(r,v,tb);
-+ return NULL;
-+ }
-+
-+ /* Try to get _aq_dynamic. */
-+ m = PyObject_GetAttrString(o, "_aq_dynamic");
-+ if (! m) {
-+ PyErr_Restore(r,v,tb);
-+ return NULL;
-+ }
-+
-+ /* Call _aq_dynamic in the context of the original acquisition wrapper. */
-+ if (PyECMethod_Check(m) && PyECMethod_Self(m)==o)
-+ ASSIGN(m,PyECMethod_New(m,OBJECT(self)));
-+ else if (has__of__(m)) ASSIGN(m,__of__(m,OBJECT(self)));
-+ d = PyObject_CallFunction(m, "O", attr_name);
-+ Py_DECREF(m);
-+
-+ /* In the case of None, assume that the attribute is not found. */
-+ if (d == Py_None) {
-+ Py_DECREF(d);
-+ PyErr_Restore(r,v,tb);
-+ return NULL;
-+ }
-+
-+ Py_XDECREF(r);
-+ Py_XDECREF(v);
-+ Py_XDECREF(tb);
-+ return d;
-+}
-+
-+static PyObject *
- Wrapper_findattr(Wrapper *self, PyObject *oname,
- PyObject *filter, PyObject *extra, PyObject *orig,
- int sob, int sco, int explicit, int containment)
-@@ -476,7 +534,7 @@
- Py_XDECREF(r); Py_XDECREF(v); Py_XDECREF(tb);
- r=NULL;
- }
-- else if ((r=PyObject_GetAttr(self->obj,oname)))
-+ else if ((r=Wrapper_GetAttr(OBJECT(self),oname,orig)))
- {
- if (r==Acquired)
- {
-@@ -550,7 +608,7 @@
- }
- else
- {
-- if ((r=PyObject_GetAttr(self->container,oname))) {
-+ if ((r=Wrapper_GetAttr(self->container,oname,orig))) {
- if (r == Acquired) {
- Py_DECREF(r);
- }
-@@ -587,7 +645,7 @@
- Wrapper_getattro(Wrapper *self, PyObject *oname)
- {
- if (self->obj || self->container)
-- return Wrapper_findattr(self, oname, NULL, NULL, NULL, 1, 1, 0, 0);
-+ return Wrapper_findattr(self, oname, NULL, NULL, OBJECT(self), 1, 1, 0, 0);
-
- /* Maybe we are getting initialized? */
- return Py_FindAttr(OBJECT(self),oname);
-@@ -604,7 +662,7 @@
- return Py_FindAttr(OBJECT(self),oname);
-
- if (self->obj || self->container)
-- return Wrapper_findattr(self, oname, NULL, NULL, NULL, 1, 0, 0, 0);
-+ return Wrapper_findattr(self, oname, NULL, NULL, OBJECT(self), 1, 0, 0, 0);
-
- /* Maybe we are getting initialized? */
- return Py_FindAttr(OBJECT(self),oname);